adjust mir-opt tests for new HIR without If

Author: Centril

Diff for: src/test/mir-opt/deaggregator_test_enum_2.rs

@@ -21,35 +21,35 @@ fn main() {
 // END RUST SOURCE
 // START rustc.test1.Deaggregator.before.mir
 //  bb1: {
-//      StorageLive(_4);
-//      _4 = _2;
-//      _0 = Foo::A(move _4,);
-//      StorageDead(_4);
-//      goto -> bb3;
-//  }
-//  bb2: {
 //      StorageLive(_5);
 //      _5 = _2;
-//      _0 = Foo::B(move _5,);
+//      _0 = Foo::A(move _5,);
 //      StorageDead(_5);
 //      goto -> bb3;
 //  }
+//  bb2: {
+//      StorageLive(_6);
+//      _6 = _2;
+//      _0 = Foo::B(move _6,);
+//      StorageDead(_6);
+//      goto -> bb3;
+//  }
 // END rustc.test1.Deaggregator.before.mir
 // START rustc.test1.Deaggregator.after.mir
 //  bb1: {
-//      StorageLive(_4);
-//      _4 = _2;
-//      ((_0 as A).0: i32) = move _4;
+//      StorageLive(_5);
+//      _5 = _2;
+//      ((_0 as A).0: i32) = move _5;
 //      discriminant(_0) = 0;
-//      StorageDead(_4);
+//      StorageDead(_5);
 //      goto -> bb3;
 //  }
 //  bb2: {
-//      StorageLive(_5);
-//      _5 = _2;
-//      ((_0 as B).0: i32) = move _5;
+//      StorageLive(_6);
+//      _6 = _2;
+//      ((_0 as B).0: i32) = move _6;
 //      discriminant(_0) = 1;
-//      StorageDead(_5);
+//      StorageDead(_6);
 //      goto -> bb3;
 //  }
 // END rustc.test1.Deaggregator.after.mir

Diff for: src/test/mir-opt/issue-38669.rs

@@ -26,16 +26,23 @@ fn main() {
 //     }
 //     bb3: {
 //         StorageLive(_4);
-//         _4 = _1;
-//         switchInt(move _4) -> [false: bb5, otherwise: bb4];
+//         StorageLive(_5);
+//         _5 = _1;
+//         FakeRead(ForLet, _5);
+//         AscribeUserType(_5, o, UserTypeProjection { base: UserType(1), projs: [] });
+//         _4 = _5;
+//         StorageDead(_5);
+//         FakeRead(ForMatchedPlace, _4);
+//         switchInt(_4) -> [false: bb5, otherwise: bb4];
 //     }
-//     bb4: {
+//     ...
+//     bb7: {
 //         _0 = ();
 //         StorageDead(_4);
 //         StorageDead(_1);
 //         return;
 //     }
-//     bb5: {
+//     bb8: {
 //         _3 = ();
 //         StorageDead(_4);
 //         _1 = const true;

Diff for: src/test/mir-opt/loop_test.rs

@@ -22,19 +22,20 @@ fn main() {
 //        resume;
 //    }
 //    ...
-//    bb3: { // Entry into the loop
+//    bb6: { // Entry into the loop
 //        _1 = ();
-//        goto -> bb4;
+//        StorageDead(_2);
+//        goto -> bb7;
 //    }
-//    bb4: { // The loop_block
-//        falseUnwind -> [real: bb5, cleanup: bb1];
+//    bb7: { // The loop_block
+//        falseUnwind -> [real: bb8, cleanup: bb1];
 //    }
-//    bb5: { // The loop body (body_block)
-//        StorageLive(_5);
-//        _5 = const 1i32;
-//        FakeRead(ForLet, _5);
-//        StorageDead(_5);
-//        goto -> bb4;
+//    bb8: { // The loop body (body_block)
+//        StorageLive(_7);
+//        _7 = const 1i32;
+//        FakeRead(ForLet, _7);
+//        StorageDead(_7);
+//        goto -> bb7;
 //    }
 //    ...
 // END rustc.main.SimplifyCfg-qualify-consts.after.mir

Diff for: src/test/mir-opt/nll/region-subtyping-basic.rs

@@ -22,9 +22,9 @@ fn main() {
 
 // END RUST SOURCE
 // START rustc.main.nll.0.mir
-// | '_#2r    | U0 | {bb2[0..=5], bb3[0..=1]}
-// | '_#3r    | U0 | {bb2[1..=5], bb3[0..=1]}
-// | '_#4r    | U0 | {bb2[4..=5], bb3[0..=1]}
+// | '_#2r | U0 | {bb2[0..=13], bb3[0], bb6[0..=1]}
+// | '_#3r | U0 | {bb2[1..=13], bb3[0], bb6[0..=1]}
+// | '_#4r | U0 | {bb2[4..=13], bb3[0], bb6[0..=1]}
 // END rustc.main.nll.0.mir
 // START rustc.main.nll.0.mir
 // let _6: &'_#4r usize;

Diff for: src/test/mir-opt/simplify_cfg.rs

@@ -43,12 +43,14 @@ fn bar() -> bool {
 //     }
 //     bb1: {
 //         StorageLive(_2);
-//         _2 = const bar() -> bb3;
+//         StorageLive(_3);
+//         _3 = const bar() -> bb3;
 //     }
 // END rustc.main.SimplifyCfg-early-opt.before.mir
 // START rustc.main.SimplifyCfg-early-opt.after.mir
 //     bb0: {
 //         StorageLive(_2);
-//         _2 = const bar() -> bb1;
+//         StorageLive(_3);
+//         _3 = const bar() -> bb1;
 //     }
 // END rustc.main.SimplifyCfg-early-opt.after.mir

Diff for: src/test/mir-opt/simplify_if.rs

@@ -5,13 +5,15 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.main.SimplifyBranches-initial.before.mir
+// START rustc.main.SimplifyBranches-after-copy-prop.before.mir
 // bb0: {
-//     switchInt(const false) -> [false: bb3, otherwise: bb2];
+//     ...
+//     switchInt(const false) -> [false: bb3, otherwise: bb1];
 // }
-// END rustc.main.SimplifyBranches-initial.before.mir
-// START rustc.main.SimplifyBranches-initial.after.mir
+// END rustc.main.SimplifyBranches-after-copy-prop.before.mir
+// START rustc.main.SimplifyBranches-after-copy-prop.after.mir
 // bb0: {
+//     ...
 //     goto -> bb3;
 // }
-// END rustc.main.SimplifyBranches-initial.after.mir
+// END rustc.main.SimplifyBranches-after-copy-prop.after.mir