Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 44 insertions, 47 deletions

diff --git a/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff b/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
index 1752d222f..0c9d1f4a3 100644
--- a/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
+++ b/tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff
@@ -2,24 +2,24 @@
 + // MIR for `main` after ConstProp
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/invalid_constant.rs:+0:11: +0:11
-      let _1: char;                        // in scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
-      let mut _2: main::InvalidChar;       // in scope 0 at $DIR/invalid_constant.rs:+6:34: +6:63
-      let mut _4: E;                       // in scope 0 at $DIR/invalid_constant.rs:+13:25: +13:59
-      let mut _5: main::InvalidTag;        // in scope 0 at $DIR/invalid_constant.rs:+13:34: +13:55
-      let mut _7: Empty;                   // in scope 0 at $DIR/invalid_constant.rs:+20:35: +20:73
-      let mut _8: main::NoVariants;        // in scope 0 at $DIR/invalid_constant.rs:+20:44: +20:65
+      let mut _0: ();
+      let _1: char;
+      let mut _2: main::InvalidChar;
+      let mut _4: E;
+      let mut _5: main::InvalidTag;
+      let mut _7: Empty;
+      let mut _8: main::NoVariants;
       scope 1 {
-          debug _invalid_char => _1;       // in scope 1 at $DIR/invalid_constant.rs:+6:9: +6:22
-          let _3: [E; 1];                  // in scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
+          debug _invalid_char => _1;
+          let _3: [E; 1];
           scope 3 {
-              debug _invalid_tag => _3;    // in scope 3 at $DIR/invalid_constant.rs:+13:9: +13:21
-              let _6: [Empty; 1];          // in scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
+              debug _invalid_tag => _3;
+              let _6: [Empty; 1];
               scope 5 {
-                  debug _enum_without_variants => const [ZeroSized: Empty]; // in scope 5 at $DIR/invalid_constant.rs:+20:9: +20:31
-                  let _9: main::Str<"���">; // in scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
+                  debug _enum_without_variants => const [ZeroSized: Empty];
+                  let _9: main::Str<"���">;
                   scope 7 {
-                      debug _non_utf8_str => const Str::<"���">; // in scope 7 at $DIR/invalid_constant.rs:+24:9: +24:22
+                      debug _non_utf8_str => const Str::<"���">;
                   }
               }
               scope 6 {
@@ -32,39 +32,36 @@
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
-          StorageLive(_2);                 // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
-          _2 = InvalidChar { int: const 1114113_u32 }; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
--         _1 = (_2.1: char);               // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
-+         _1 = const {transmute(0x00110001): char}; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
-          StorageDead(_2);                 // scope 0 at $DIR/invalid_constant.rs:+6:69: +6:70
-          StorageLive(_3);                 // scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
-          StorageLive(_4);                 // scope 1 at $DIR/invalid_constant.rs:+13:25: +13:59
-          StorageLive(_5);                 // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
-          _5 = InvalidTag { int: const 4_u32 }; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
--         _4 = (_5.1: E);                  // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57
-+         _4 = const Scalar(0x00000004): E; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57
-+                                          // mir::Constant
-+                                          // + span: no-location
-+                                          // + literal: Const { ty: E, val: Value(Scalar(0x00000004)) }
-          _3 = [move _4];                  // scope 1 at $DIR/invalid_constant.rs:+13:24: +13:60
-          StorageDead(_4);                 // scope 1 at $DIR/invalid_constant.rs:+13:59: +13:60
-          StorageDead(_5);                 // scope 1 at $DIR/invalid_constant.rs:+13:60: +13:61
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
-          StorageLive(_8);                 // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          _8 = NoVariants { int: const 0_u32 }; // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
-          nop;                             // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
-          StorageDead(_8);                 // scope 3 at $DIR/invalid_constant.rs:+20:74: +20:75
-          nop;                             // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
-          nop;                             // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
-          nop;                             // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
-          nop;                             // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
-          StorageDead(_3);                 // scope 1 at $DIR/invalid_constant.rs:+27:1: +27:2
-          StorageDead(_1);                 // scope 0 at $DIR/invalid_constant.rs:+27:1: +27:2
-          return;                          // scope 0 at $DIR/invalid_constant.rs:+27:2: +27:2
+          StorageLive(_1);
+          StorageLive(_2);
+          _2 = InvalidChar { int: const 1114113_u32 };
+-         _1 = (_2.1: char);
++         _1 = const {transmute(0x00110001): char};
+          StorageDead(_2);
+          StorageLive(_3);
+          StorageLive(_4);
+          StorageLive(_5);
+          _5 = InvalidTag { int: const 4_u32 };
+-         _4 = (_5.1: E);
++         _4 = const Scalar(0x00000004): E;
+          _3 = [move _4];
+          StorageDead(_4);
+          StorageDead(_5);
+          nop;
+          nop;
+          StorageLive(_8);
+          _8 = NoVariants { int: const 0_u32 };
+          nop;
+          nop;
+          nop;
+          StorageDead(_8);
+          nop;
+          nop;
+          nop;
+          nop;
+          StorageDead(_3);
+          StorageDead(_1);
+          return;
       }
   }