Rebase fallout.

Author: cjgillot

tests/mir-opt/jump_threading.rs

@@ -1,5 +1,5 @@
 // unit-test: JumpThreading
-// compile-flags: -Zmir-enable-passes=+Inline
+// compile-flags: -Zmir-enable-passes=+Inline -Zinline-mir
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 
 #![feature(control_flow_enum)]

tests/mir-opt/while_storage.while_loop.PreCodegen.after.panic-abort.mir

@@ -11,18 +11,6 @@ fn while_loop(_1: bool) -> () {
     }
 
     bb0: {
-        goto -> bb1;
-    }
-
-    bb1: {
-        switchInt(_1) -> [0: bb3, otherwise: bb2];
-    }
-
-    bb2: {
-        switchInt(_1) -> [0: bb1, otherwise: bb3];
-    }
-
-    bb3: {
         return;
     }
 }

tests/mir-opt/while_storage.while_loop.PreCodegen.after.panic-unwind.mir

@@ -11,18 +11,6 @@ fn while_loop(_1: bool) -> () {
     }
 
     bb0: {
-        goto -> bb1;
-    }
-
-    bb1: {
-        switchInt(_1) -> [0: bb3, otherwise: bb2];
-    }
-
-    bb2: {
-        switchInt(_1) -> [0: bb1, otherwise: bb3];
-    }
-
-    bb3: {
         return;
     }
 }