Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 27 deletions

diff --git a/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
index 8eb1aa1f3..f20ab869b 100644
--- a/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
+++ b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff
@@ -2,51 +2,47 @@
 + // MIR for `main` after SimplifyCfg-early-opt
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/simplify_cfg.rs:+0:11: +0:11
-      let mut _1: ();                      // in scope 0 at $DIR/simplify_cfg.rs:+0:1: +6:2
-      let mut _2: bool;                    // in scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
-      let mut _3: !;                       // in scope 0 at $DIR/simplify_cfg.rs:+2:18: +4:10
+      let mut _0: ();
+      let mut _1: ();
+      let mut _2: bool;
+      let mut _3: !;
   
       bb0: {
-          goto -> bb1;                     // scope 0 at $DIR/simplify_cfg.rs:+1:5: +5:6
+          goto -> bb1;
       }
   
       bb1: {
--         goto -> bb2;                     // scope 0 at $DIR/simplify_cfg.rs:+1:5: +5:6
--     }
-- 
--     bb2: {
-          StorageLive(_2);                 // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
--         _2 = bar() -> [return: bb3, unwind: bb6]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
-+         _2 = bar() -> [return: bb2, unwind: bb5]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
-                                           // mir::Constant
-                                           // + span: $DIR/simplify_cfg.rs:9:12: 9:15
-                                           // + literal: Const { ty: fn() -> bool {bar}, val: Value(<ZST>) }
+-         goto -> bb2;
++         StorageLive(_2);
++         _2 = bar() -> [return: bb2, unwind: bb5];
       }
   
--     bb3: {
--         switchInt(move _2) -> [0: bb5, otherwise: bb4]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
-+     bb2: {
-+         switchInt(move _2) -> [0: bb4, otherwise: bb3]; // scope 0 at $DIR/simplify_cfg.rs:+2:12: +2:17
+      bb2: {
+-         StorageLive(_2);
+-         _2 = bar() -> [return: bb3, unwind: bb6];
++         switchInt(move _2) -> [0: bb4, otherwise: bb3];
       }
   
+      bb3: {
+-         switchInt(move _2) -> [0: bb5, otherwise: bb4];
+-     }
+- 
 -     bb4: {
-+     bb3: {
-          _0 = const ();                   // scope 0 at $DIR/simplify_cfg.rs:+3:13: +3:18
-          StorageDead(_2);                 // scope 0 at $DIR/simplify_cfg.rs:+4:9: +4:10
-          return;                          // scope 0 at $DIR/simplify_cfg.rs:+6:2: +6:2
+          _0 = const ();
+          StorageDead(_2);
+          return;
       }
   
 -     bb5: {
 +     bb4: {
-          _1 = const ();                   // scope 0 at $DIR/simplify_cfg.rs:+4:10: +4:10
-          StorageDead(_2);                 // scope 0 at $DIR/simplify_cfg.rs:+4:9: +4:10
-          goto -> bb1;                     // scope 0 at $DIR/simplify_cfg.rs:+1:5: +5:6
+          _1 = const ();
+          StorageDead(_2);
+          goto -> bb1;
       }
   
 -     bb6 (cleanup): {
 +     bb5 (cleanup): {
-          resume;                          // scope 0 at $DIR/simplify_cfg.rs:+0:1: +6:2
+          resume;
       }
   }