Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff b/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
index 89f1846b4..31f727e5f 100644
--- a/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
+++ b/tests/mir-opt/dead-store-elimination/provenance_soundness.pointer_to_int.DeadStoreElimination.diff
@@ -2,34 +2,34 @@
 + // MIR for `pointer_to_int` after DeadStoreElimination
   
   fn pointer_to_int(_1: *mut i32) -> () {
-      debug p => _1;                       // in scope 0 at $DIR/provenance_soundness.rs:+0:19: +0:20
-      let mut _0: ();                      // return place in scope 0 at $DIR/provenance_soundness.rs:+0:32: +0:32
-      let _2: usize;                       // in scope 0 at $DIR/provenance_soundness.rs:+1:9: +1:11
-      let mut _3: *mut i32;                // in scope 0 at $DIR/provenance_soundness.rs:+1:14: +1:15
-      let mut _5: *mut i32;                // in scope 0 at $DIR/provenance_soundness.rs:+2:14: +2:15
+      debug p => _1;
+      let mut _0: ();
+      let _2: usize;
+      let mut _3: *mut i32;
+      let mut _5: *mut i32;
       scope 1 {
-          debug _x => _2;                  // in scope 1 at $DIR/provenance_soundness.rs:+1:9: +1:11
-          let _4: isize;                   // in scope 1 at $DIR/provenance_soundness.rs:+2:9: +2:11
+          debug _x => _2;
+          let _4: isize;
           scope 2 {
-              debug _y => _4;              // in scope 2 at $DIR/provenance_soundness.rs:+2:9: +2:11
+              debug _y => _4;
           }
       }
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/provenance_soundness.rs:+1:9: +1:11
-          StorageLive(_3);                 // scope 0 at $DIR/provenance_soundness.rs:+1:14: +1:15
-          _3 = _1;                         // scope 0 at $DIR/provenance_soundness.rs:+1:14: +1:15
-          _2 = move _3 as usize (PointerExposeAddress); // scope 0 at $DIR/provenance_soundness.rs:+1:14: +1:24
-          StorageDead(_3);                 // scope 0 at $DIR/provenance_soundness.rs:+1:23: +1:24
-          StorageLive(_4);                 // scope 1 at $DIR/provenance_soundness.rs:+2:9: +2:11
-          StorageLive(_5);                 // scope 1 at $DIR/provenance_soundness.rs:+2:14: +2:15
-          _5 = _1;                         // scope 1 at $DIR/provenance_soundness.rs:+2:14: +2:15
-          _4 = move _5 as isize (PointerExposeAddress); // scope 1 at $DIR/provenance_soundness.rs:+2:14: +2:24
-          StorageDead(_5);                 // scope 1 at $DIR/provenance_soundness.rs:+2:23: +2:24
-          _0 = const ();                   // scope 0 at $DIR/provenance_soundness.rs:+0:32: +3:2
-          StorageDead(_4);                 // scope 1 at $DIR/provenance_soundness.rs:+3:1: +3:2
-          StorageDead(_2);                 // scope 0 at $DIR/provenance_soundness.rs:+3:1: +3:2
-          return;                          // scope 0 at $DIR/provenance_soundness.rs:+3:2: +3:2
+          StorageLive(_2);
+          StorageLive(_3);
+          _3 = _1;
+          _2 = move _3 as usize (PointerExposeAddress);
+          StorageDead(_3);
+          StorageLive(_4);
+          StorageLive(_5);
+          _5 = _1;
+          _4 = move _5 as isize (PointerExposeAddress);
+          StorageDead(_5);
+          _0 = const ();
+          StorageDead(_4);
+          StorageDead(_2);
+          return;
       }
   }