Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 64 insertions, 67 deletions

diff --git a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
index f1f53a481..255ec9481 100644
--- a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
+++ b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff
@@ -2,49 +2,49 @@
 + // MIR for `main` after ConstDebugInfo
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/const_debuginfo.rs:+0:11: +0:11
-      let _1: u8;                          // in scope 0 at $DIR/const_debuginfo.rs:+1:9: +1:10
-      let mut _5: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:15: +4:20
-      let mut _6: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:15: +4:16
-      let mut _7: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:19: +4:20
-      let mut _8: u8;                      // in scope 0 at $DIR/const_debuginfo.rs:+4:23: +4:24
-      let mut _12: u32;                    // in scope 0 at $DIR/const_debuginfo.rs:+13:13: +13:16
-      let mut _13: u32;                    // in scope 0 at $DIR/const_debuginfo.rs:+13:19: +13:22
+      let mut _0: ();
+      let _1: u8;
+      let mut _5: u8;
+      let mut _6: u8;
+      let mut _7: u8;
+      let mut _8: u8;
+      let mut _12: u32;
+      let mut _13: u32;
       scope 1 {
--         debug x => _1;                   // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
-+         debug x => const 1_u8;           // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
-          let _2: u8;                      // in scope 1 at $DIR/const_debuginfo.rs:+2:9: +2:10
+-         debug x => _1;
++         debug x => const 1_u8;
+          let _2: u8;
           scope 2 {
--             debug y => _2;               // in scope 2 at $DIR/const_debuginfo.rs:+2:9: +2:10
-+             debug y => const 2_u8;       // in scope 2 at $DIR/const_debuginfo.rs:+2:9: +2:10
-              let _3: u8;                  // in scope 2 at $DIR/const_debuginfo.rs:+3:9: +3:10
+-             debug y => _2;
++             debug y => const 2_u8;
+              let _3: u8;
               scope 3 {
--                 debug z => _3;           // in scope 3 at $DIR/const_debuginfo.rs:+3:9: +3:10
-+                 debug z => const 3_u8;   // in scope 3 at $DIR/const_debuginfo.rs:+3:9: +3:10
-                  let _4: u8;              // in scope 3 at $DIR/const_debuginfo.rs:+4:9: +4:12
+-                 debug z => _3;
++                 debug z => const 3_u8;
+                  let _4: u8;
                   scope 4 {
--                     debug sum => _4;     // in scope 4 at $DIR/const_debuginfo.rs:+4:9: +4:12
-+                     debug sum => const 6_u8; // in scope 4 at $DIR/const_debuginfo.rs:+4:9: +4:12
-                      let _9: &str;        // in scope 4 at $DIR/const_debuginfo.rs:+6:9: +6:10
+-                     debug sum => _4;
++                     debug sum => const 6_u8;
+                      let _9: &str;
                       scope 5 {
--                         debug s => _9;   // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
-+                         debug s => const "hello, world!"; // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
-                          let _14: bool;   // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
-                          let _15: bool;   // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
-                          let _16: u32;    // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
+-                         debug s => _9;
++                         debug s => const "hello, world!";
+                          let _14: bool;
+                          let _15: bool;
+                          let _16: u32;
                           scope 6 {
-                              debug f => (bool, bool, u32){ .0 => _14, .1 => _15, .2 => _16, }; // in scope 6 at $DIR/const_debuginfo.rs:+8:9: +8:10
-                              let _10: std::option::Option<u16>; // in scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
+                              debug f => (bool, bool, u32){ .0 => _14, .1 => _15, .2 => _16, };
+                              let _10: std::option::Option<u16>;
                               scope 7 {
-                                  debug o => _10; // in scope 7 at $DIR/const_debuginfo.rs:+10:9: +10:10
-                                  let _17: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
-                                  let _18: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
+                                  debug o => _10;
+                                  let _17: u32;
+                                  let _18: u32;
                                   scope 8 {
-                                      debug p => Point{ .0 => _17, .1 => _18, }; // in scope 8 at $DIR/const_debuginfo.rs:+12:9: +12:10
-                                      let _11: u32; // in scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
+                                      debug p => Point{ .0 => _17, .1 => _18, };
+                                      let _11: u32;
                                       scope 9 {
--                                         debug a => _11; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
-+                                         debug a => const 64_u32; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
+-                                         debug a => _11;
++                                         debug a => const 64_u32;
                                       }
                                   }
                               }
@@ -56,39 +56,36 @@
       }
   
       bb0: {
-          _1 = const 1_u8;                 // scope 0 at $DIR/const_debuginfo.rs:+1:13: +1:16
-          _2 = const 2_u8;                 // scope 1 at $DIR/const_debuginfo.rs:+2:13: +2:16
-          _3 = const 3_u8;                 // scope 2 at $DIR/const_debuginfo.rs:+3:13: +3:16
-          StorageLive(_4);                 // scope 3 at $DIR/const_debuginfo.rs:+4:9: +4:12
-          StorageLive(_5);                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:20
-          _5 = const 3_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:20
-          _4 = const 6_u8;                 // scope 3 at $DIR/const_debuginfo.rs:+4:15: +4:24
-          StorageDead(_5);                 // scope 3 at $DIR/const_debuginfo.rs:+4:23: +4:24
-          StorageLive(_9);                 // scope 4 at $DIR/const_debuginfo.rs:+6:9: +6:10
-          _9 = const "hello, world!";      // scope 4 at $DIR/const_debuginfo.rs:+6:13: +6:28
-                                           // mir::Constant
-                                           // + span: $DIR/const_debuginfo.rs:14:13: 14:28
-                                           // + literal: Const { ty: &str, val: Value(Slice(..)) }
-          StorageLive(_14);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
-          StorageLive(_15);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
-          StorageLive(_16);                // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
-          _14 = const true;                // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
-          _15 = const false;               // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
-          _16 = const 123_u32;             // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
-          StorageLive(_10);                // scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
-          _10 = Option::<u16>::Some(const 99_u16); // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
-          _17 = const 32_u32;              // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
-          _18 = const 32_u32;              // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
-          StorageLive(_11);                // scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
-          _11 = const 64_u32;              // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:22
-          StorageDead(_11);                // scope 8 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_10);                // scope 6 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_14);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_15);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_16);                // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_9);                 // scope 4 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          StorageDead(_4);                 // scope 3 at $DIR/const_debuginfo.rs:+14:1: +14:2
-          return;                          // scope 0 at $DIR/const_debuginfo.rs:+14:2: +14:2
+          _1 = const 1_u8;
+          _2 = const 2_u8;
+          _3 = const 3_u8;
+          StorageLive(_4);
+          StorageLive(_5);
+          _5 = const 3_u8;
+          _4 = const 6_u8;
+          StorageDead(_5);
+          StorageLive(_9);
+          _9 = const "hello, world!";
+          StorageLive(_14);
+          StorageLive(_15);
+          StorageLive(_16);
+          _14 = const true;
+          _15 = const false;
+          _16 = const 123_u32;
+          StorageLive(_10);
+          _10 = Option::<u16>::Some(const 99_u16);
+          _17 = const 32_u32;
+          _18 = const 32_u32;
+          StorageLive(_11);
+          _11 = const 64_u32;
+          StorageDead(_11);
+          StorageDead(_10);
+          StorageDead(_14);
+          StorageDead(_15);
+          StorageDead(_16);
+          StorageDead(_9);
+          StorageDead(_4);
+          return;
       }
   }