updated mir-opt test due to other recent changes to MIR

diff --git a/src/test/mir-opt/instrument_coverage/rustc.main.InstrumentCoverage.diff b/src/test/mir-opt/instrument_coverage/rustc.main.InstrumentCoverage.diff
index d5d0f82495d1a113f3aad7f075adf130154b77b6..095246580409eb240d02f681b0388ddf8aa7803c 100644 (file)
--- a/src/test/mir-opt/instrument_coverage/rustc.main.InstrumentCoverage.diff
+++ b/src/test/mir-opt/instrument_coverage/rustc.main.InstrumentCoverage.diff
@@ -9,7 +9,7 @@
 +     let mut _4: ();                      // in scope 0 at $DIR/instrument_coverage.rs:8:1: 14:2
   
       bb0: {
--         falseUnwind -> [real: bb1, cleanup: bb6]; // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
+-         falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
 +         StorageLive(_4);                 // scope 0 at $DIR/instrument_coverage.rs:8:1: 14:2
 +         _4 = const std::intrinsics::count_code_region(const 0u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:8:1: 14:2
 +                                          // ty::Const
@@ -28,7 +28,7 @@
   
       bb1: {
           StorageLive(_2);                 // scope 0 at $DIR/instrument_coverage.rs:10:12: 10:17
-          _2 = const bar() -> [return: bb2, unwind: bb6]; // scope 0 at $DIR/instrument_coverage.rs:10:12: 10:17
+          _2 = const bar() -> [return: bb3, unwind: bb2]; // scope 0 at $DIR/instrument_coverage.rs:10:12: 10:17
                                            // ty::Const
                                            // + ty: fn() -> bool {bar}
                                            // + val: Value(Scalar(<ZST>))
@@ -37,16 +37,20 @@
                                            // + literal: Const { ty: fn() -> bool {bar}, val: Value(Scalar(<ZST>)) }
       }
   
-      bb2: {
-          FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/instrument_coverage.rs:10:12: 10:17
-          switchInt(_2) -> [false: bb4, otherwise: bb3]; // scope 0 at $DIR/instrument_coverage.rs:10:9: 12:10
+      bb2 (cleanup): {
+          resume;                          // scope 0 at $DIR/instrument_coverage.rs:8:1: 14:2
       }
   
       bb3: {
-          falseEdges -> [real: bb5, imaginary: bb4]; // scope 0 at $DIR/instrument_coverage.rs:10:9: 12:10
+          FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/instrument_coverage.rs:10:12: 10:17
+          switchInt(_2) -> [false: bb5, otherwise: bb4]; // scope 0 at $DIR/instrument_coverage.rs:10:9: 12:10
       }
   
       bb4: {
+          falseEdge -> [real: bb6, imaginary: bb5]; // scope 0 at $DIR/instrument_coverage.rs:10:9: 12:10
+      }
+  
+      bb5: {
           _1 = const ();                   // scope 0 at $DIR/instrument_coverage.rs:10:9: 12:10
                                            // ty::Const
                                            // + ty: ()
@@ -58,7 +62,7 @@
           goto -> bb0;                     // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
       }
   
-      bb5: {
+      bb6: {
           _0 = const ();                   // scope 0 at $DIR/instrument_coverage.rs:11:13: 11:18
                                            // ty::Const
                                            // + ty: ()
@@ -68,15 +72,11 @@
                                            // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
           StorageDead(_2);                 // scope 0 at $DIR/instrument_coverage.rs:13:5: 13:6
           return;                          // scope 0 at $DIR/instrument_coverage.rs:14:2: 14:2
-      }
-  
-      bb6 (cleanup): {
-          resume;                          // scope 0 at $DIR/instrument_coverage.rs:8:1: 14:2
 +     }
 + 
 +     bb7: {
 +         StorageDead(_4);                 // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
-+         falseUnwind -> [real: bb1, cleanup: bb6]; // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
++         falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at $DIR/instrument_coverage.rs:9:5: 13:6
       }
   }