Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/mir-opt/sroa/structs.dropping.ScalarReplacementOfAggregates.diff b/tests/mir-opt/sroa/structs.dropping.ScalarReplacementOfAggregates.diff
index d378c260a..bc38a219e 100644
--- a/tests/mir-opt/sroa/structs.dropping.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa/structs.dropping.ScalarReplacementOfAggregates.diff
@@ -2,43 +2,43 @@
 + // MIR for `dropping` after ScalarReplacementOfAggregates
   
   fn dropping() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/structs.rs:+0:19: +0:19
-      let _1: Tag;                         // in scope 0 at $DIR/structs.rs:+1:5: +1:32
-      let mut _2: S;                       // in scope 0 at $DIR/structs.rs:+1:5: +1:30
-      let mut _3: Tag;                     // in scope 0 at $DIR/structs.rs:+1:7: +1:13
-      let mut _4: Tag;                     // in scope 0 at $DIR/structs.rs:+1:15: +1:21
-      let mut _5: Tag;                     // in scope 0 at $DIR/structs.rs:+1:23: +1:29
+      let mut _0: ();
+      let _1: Tag;
+      let mut _2: S;
+      let mut _3: Tag;
+      let mut _4: Tag;
+      let mut _5: Tag;
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/structs.rs:+1:5: +1:32
-          StorageLive(_2);                 // scope 0 at $DIR/structs.rs:+1:5: +1:30
-          StorageLive(_3);                 // scope 0 at $DIR/structs.rs:+1:7: +1:13
-          _3 = Tag(const 0_usize);         // scope 0 at $DIR/structs.rs:+1:7: +1:13
-          StorageLive(_4);                 // scope 0 at $DIR/structs.rs:+1:15: +1:21
-          _4 = Tag(const 1_usize);         // scope 0 at $DIR/structs.rs:+1:15: +1:21
-          StorageLive(_5);                 // scope 0 at $DIR/structs.rs:+1:23: +1:29
-          _5 = Tag(const 2_usize);         // scope 0 at $DIR/structs.rs:+1:23: +1:29
-          _2 = S(move _3, move _4, move _5); // scope 0 at $DIR/structs.rs:+1:5: +1:30
-          StorageDead(_5);                 // scope 0 at $DIR/structs.rs:+1:29: +1:30
-          StorageDead(_4);                 // scope 0 at $DIR/structs.rs:+1:29: +1:30
-          StorageDead(_3);                 // scope 0 at $DIR/structs.rs:+1:29: +1:30
-          _1 = move (_2.1: Tag);           // scope 0 at $DIR/structs.rs:+1:5: +1:32
-          drop(_1) -> [return: bb1, unwind unreachable]; // scope 0 at $DIR/structs.rs:+1:32: +1:33
+          StorageLive(_1);
+          StorageLive(_2);
+          StorageLive(_3);
+          _3 = Tag(const 0_usize);
+          StorageLive(_4);
+          _4 = Tag(const 1_usize);
+          StorageLive(_5);
+          _5 = Tag(const 2_usize);
+          _2 = S(move _3, move _4, move _5);
+          StorageDead(_5);
+          StorageDead(_4);
+          StorageDead(_3);
+          _1 = move (_2.1: Tag);
+          drop(_1) -> [return: bb1, unwind unreachable];
       }
   
       bb1: {
-          drop((_2.0: Tag)) -> [return: bb3, unwind unreachable]; // scope 0 at $DIR/structs.rs:+1:32: +1:33
+          drop((_2.0: Tag)) -> [return: bb3, unwind unreachable];
       }
   
       bb2: {
-          StorageDead(_2);                 // scope 0 at $DIR/structs.rs:+1:32: +1:33
-          StorageDead(_1);                 // scope 0 at $DIR/structs.rs:+1:32: +1:33
-          _0 = const ();                   // scope 0 at $DIR/structs.rs:+0:19: +2:2
-          return;                          // scope 0 at $DIR/structs.rs:+2:2: +2:2
+          StorageDead(_2);
+          StorageDead(_1);
+          _0 = const ();
+          return;
       }
   
       bb3: {
-          drop((_2.2: Tag)) -> [return: bb2, unwind unreachable]; // scope 0 at $DIR/structs.rs:+1:32: +1:33
+          drop((_2.2: Tag)) -> [return: bb2, unwind unreachable];
       }
   }