e6ba504029
match lowering: don't collect test alternatives ahead of time I'm very happy with this one. Before this, when sorting candidates into the possible test branches, we manually computed `usize` indices to determine in which branch each candidate goes. To make this work we had a first pass that collected the possible alternatives we'd have to deal with, and a second pass that actually sorts the candidates. In this PR, I replace `usize` indices with a dedicated enum. This makes `sort_candidates` easier to follow, and we don't need the first pass anymore. r? ``@matthewjasper``
90 lines
2.2 KiB
Diff
90 lines
2.2 KiB
Diff
- // MIR for `opt2` before EarlyOtherwiseBranch
|
|
+ // MIR for `opt2` after EarlyOtherwiseBranch
|
|
|
|
fn opt2(_1: Option<u32>, _2: Option<u32>) -> u32 {
|
|
debug x => _1;
|
|
debug y => _2;
|
|
let mut _0: u32;
|
|
let mut _3: (std::option::Option<u32>, std::option::Option<u32>);
|
|
let mut _4: std::option::Option<u32>;
|
|
let mut _5: std::option::Option<u32>;
|
|
let mut _6: isize;
|
|
let mut _7: isize;
|
|
let mut _8: isize;
|
|
let _9: u32;
|
|
let _10: u32;
|
|
+ let mut _11: isize;
|
|
+ let mut _12: bool;
|
|
scope 1 {
|
|
debug a => _9;
|
|
debug b => _10;
|
|
}
|
|
|
|
bb0: {
|
|
StorageLive(_3);
|
|
StorageLive(_4);
|
|
_4 = _1;
|
|
StorageLive(_5);
|
|
_5 = _2;
|
|
_3 = (move _4, move _5);
|
|
StorageDead(_5);
|
|
StorageDead(_4);
|
|
_8 = discriminant((_3.0: std::option::Option<u32>));
|
|
- switchInt(move _8) -> [0: bb3, 1: bb2, otherwise: bb1];
|
|
+ StorageLive(_11);
|
|
+ _11 = discriminant((_3.1: std::option::Option<u32>));
|
|
+ StorageLive(_12);
|
|
+ _12 = Ne(_8, move _11);
|
|
+ StorageDead(_11);
|
|
+ switchInt(move _12) -> [0: bb5, otherwise: bb1];
|
|
}
|
|
|
|
bb1: {
|
|
+ StorageDead(_12);
|
|
_0 = const 1_u32;
|
|
- goto -> bb6;
|
|
+ goto -> bb4;
|
|
}
|
|
|
|
bb2: {
|
|
- _6 = discriminant((_3.1: std::option::Option<u32>));
|
|
- switchInt(move _6) -> [1: bb4, otherwise: bb1];
|
|
- }
|
|
-
|
|
- bb3: {
|
|
- _7 = discriminant((_3.1: std::option::Option<u32>));
|
|
- switchInt(move _7) -> [0: bb5, otherwise: bb1];
|
|
- }
|
|
-
|
|
- bb4: {
|
|
StorageLive(_9);
|
|
_9 = (((_3.0: std::option::Option<u32>) as Some).0: u32);
|
|
StorageLive(_10);
|
|
_10 = (((_3.1: std::option::Option<u32>) as Some).0: u32);
|
|
_0 = const 0_u32;
|
|
StorageDead(_10);
|
|
StorageDead(_9);
|
|
- goto -> bb6;
|
|
+ goto -> bb4;
|
|
}
|
|
|
|
- bb5: {
|
|
+ bb3: {
|
|
_0 = const 0_u32;
|
|
- goto -> bb6;
|
|
+ goto -> bb4;
|
|
}
|
|
|
|
- bb6: {
|
|
+ bb4: {
|
|
StorageDead(_3);
|
|
return;
|
|
+ }
|
|
+
|
|
+ bb5: {
|
|
+ StorageDead(_12);
|
|
+ switchInt(_8) -> [0: bb3, 1: bb2, otherwise: bb1];
|
|
}
|
|
}
|
|
|