Bless mir-opt.

Author: cjgillot

tests/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir

@@ -17,10 +17,6 @@ fn main() -> () {
         StorageLive(_2);
         _2 = Test1::C;
         _3 = discriminant(_2);
-        switchInt(move _3) -> [2: bb1, otherwise: bb2];
-    }
-
-    bb1: {
         StorageLive(_5);
         _5 = const "C";
         _1 = &(*_5);
@@ -31,27 +27,27 @@ fn main() -> () {
         StorageLive(_7);
         _7 = Test2::D;
         _8 = discriminant(_7);
-        switchInt(move _8) -> [4: bb4, 5: bb3, otherwise: bb2];
-    }
-
-    bb2: {
-        unreachable;
+        switchInt(move _8) -> [4: bb3, 5: bb1, otherwise: bb2];
     }
 
-    bb3: {
+    bb1: {
         StorageLive(_9);
         _9 = const "E";
         _6 = &(*_9);
         StorageDead(_9);
-        goto -> bb5;
+        goto -> bb4;
     }
 
-    bb4: {
+    bb2: {
+        unreachable;
+    }
+
+    bb3: {
         _6 = const "D";
-        goto -> bb5;
+        goto -> bb4;
     }
 
-    bb5: {
+    bb4: {
         StorageDead(_7);
         StorageDead(_6);
         _0 = const ();

tests/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff

@@ -18,53 +18,53 @@
           StorageLive(_2);
           _2 = Test1::C;
           _3 = discriminant(_2);
--         switchInt(move _3) -> [0: bb3, 1: bb4, 2: bb1, otherwise: bb2];
-+         switchInt(move _3) -> [2: bb1, otherwise: bb2];
+-         switchInt(move _3) -> [0: bb2, 1: bb3, otherwise: bb1];
++         switchInt(move _3) -> bb1;
       }
 
       bb1: {
           StorageLive(_5);
           _5 = const "C";
           _1 = &(*_5);
           StorageDead(_5);
-          goto -> bb5;
+          goto -> bb4;
       }
 
       bb2: {
-          unreachable;
-      }
-  
-      bb3: {
           _1 = const "A(Empty)";
-          goto -> bb5;
+          goto -> bb4;
       }
 
-      bb4: {
+      bb3: {
           StorageLive(_4);
           _4 = const "B(Empty)";
           _1 = &(*_4);
           StorageDead(_4);
-          goto -> bb5;
+          goto -> bb4;
       }
 
-      bb5: {
+      bb4: {
           StorageDead(_2);
           StorageDead(_1);
           StorageLive(_6);
           StorageLive(_7);
           _7 = Test2::D;
           _8 = discriminant(_7);
-          switchInt(move _8) -> [4: bb7, 5: bb6, otherwise: bb2];
+          switchInt(move _8) -> [4: bb7, 5: bb5, otherwise: bb6];
       }
 
-      bb6: {
+      bb5: {
           StorageLive(_9);
           _9 = const "E";
           _6 = &(*_9);
           StorageDead(_9);
           goto -> bb8;
       }
 
+      bb6: {
+          unreachable;
+      }
+  
       bb7: {
           _6 = const "D";
           goto -> bb8;