Auto merge of #99780 - Nilstrieb:mir-opt-test-line-no, r=oli-obk

Use line numbers relative to the function in mir-opt tests

As shown in #99770, the line numbers can be a big source of needless and confusing diffs. This PR adds a new flag `-Zmir-pretty-relative-line-numbers` to make them relative to the function declaration, which avoids most needless diffs from attribute changes.

`@JakobDegen` told me that there has been a zulip conversation about disabling line numbers with mixed opinions, so I'd like to get some feedback here, for this hopefully better solution.

r? rust-lang/wg-mir-opt

1 files changed, 21 insertions, 21 deletions

diff --git a/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff b/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff
index 821075047cb..836443bf4d2 100644
--- a/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff
+++ b/src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff
@@ -2,31 +2,31 @@
 + // MIR for `main` after ConstProp
   
   fn main() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/aggregate.rs:4:11: 4:11
-      let _1: i32;                         // in scope 0 at $DIR/aggregate.rs:5:9: 5:10
-      let mut _2: i32;                     // in scope 0 at $DIR/aggregate.rs:5:13: 5:24
-      let mut _3: (i32, i32, i32);         // in scope 0 at $DIR/aggregate.rs:5:13: 5:22
+      let mut _0: ();                      // return place in scope 0 at $DIR/aggregate.rs:+0:11: +0:11
+      let _1: i32;                         // in scope 0 at $DIR/aggregate.rs:+1:9: +1:10
+      let mut _2: i32;                     // in scope 0 at $DIR/aggregate.rs:+1:13: +1:24
+      let mut _3: (i32, i32, i32);         // in scope 0 at $DIR/aggregate.rs:+1:13: +1:22
       scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/aggregate.rs:5:9: 5:10
+          debug x => _1;                   // in scope 1 at $DIR/aggregate.rs:+1:9: +1:10
       }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/aggregate.rs:5:9: 5:10
-          StorageLive(_2);                 // scope 0 at $DIR/aggregate.rs:5:13: 5:24
-          StorageLive(_3);                 // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-          Deinit(_3);                      // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-          (_3.0: i32) = const 0_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-          (_3.1: i32) = const 1_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-          (_3.2: i32) = const 2_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
--         _2 = (_3.1: i32);                // scope 0 at $DIR/aggregate.rs:5:13: 5:24
--         _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/aggregate.rs:5:13: 5:28
-+         _2 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:5:13: 5:24
-+         _1 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:5:13: 5:28
-          StorageDead(_2);                 // scope 0 at $DIR/aggregate.rs:5:27: 5:28
-          StorageDead(_3);                 // scope 0 at $DIR/aggregate.rs:5:28: 5:29
-          nop;                             // scope 0 at $DIR/aggregate.rs:4:11: 6:2
-          StorageDead(_1);                 // scope 0 at $DIR/aggregate.rs:6:1: 6:2
-          return;                          // scope 0 at $DIR/aggregate.rs:6:2: 6:2
+          StorageLive(_1);                 // scope 0 at $DIR/aggregate.rs:+1:9: +1:10
+          StorageLive(_2);                 // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
+          StorageLive(_3);                 // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
+          Deinit(_3);                      // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
+          (_3.0: i32) = const 0_i32;       // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
+          (_3.1: i32) = const 1_i32;       // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
+          (_3.2: i32) = const 2_i32;       // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
+-         _2 = (_3.1: i32);                // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
+-         _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/aggregate.rs:+1:13: +1:28
++         _2 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
++         _1 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:+1:13: +1:28
+          StorageDead(_2);                 // scope 0 at $DIR/aggregate.rs:+1:27: +1:28
+          StorageDead(_3);                 // scope 0 at $DIR/aggregate.rs:+1:28: +1:29
+          nop;                             // scope 0 at $DIR/aggregate.rs:+0:11: +2:2
+          StorageDead(_1);                 // scope 0 at $DIR/aggregate.rs:+2:1: +2:2
+          return;                          // scope 0 at $DIR/aggregate.rs:+2:2: +2:2
       }
   }