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, 25 insertions, 25 deletions

diff --git a/src/test/mir-opt/inline/cycle.g.Inline.diff b/src/test/mir-opt/inline/cycle.g.Inline.diff
index 5a8c147a327..59f34d379ec 100644
--- a/src/test/mir-opt/inline/cycle.g.Inline.diff
+++ b/src/test/mir-opt/inline/cycle.g.Inline.diff
@@ -2,56 +2,56 @@
 + // MIR for `g` after Inline
   
   fn g() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/cycle.rs:11:8: 11:8
-      let _1: ();                          // in scope 0 at $DIR/cycle.rs:12:5: 12:12
-+     let mut _2: fn() {main};             // in scope 0 at $DIR/cycle.rs:12:5: 12:12
+      let mut _0: ();                      // return place in scope 0 at $DIR/cycle.rs:+0:8: +0:8
+      let _1: ();                          // in scope 0 at $DIR/cycle.rs:+1:5: +1:12
++     let mut _2: fn() {main};             // in scope 0 at $DIR/cycle.rs:+1:5: +1:12
 +     scope 1 (inlined f::<fn() {main}>) { // at $DIR/cycle.rs:12:5: 12:12
-+         debug g => _2;                   // in scope 1 at $DIR/cycle.rs:5:6: 5:7
-+         let _3: ();                      // in scope 1 at $DIR/cycle.rs:6:5: 6:8
-+         let mut _4: &fn() {main};        // in scope 1 at $DIR/cycle.rs:6:5: 6:6
-+         let mut _5: ();                  // in scope 1 at $DIR/cycle.rs:6:5: 6:8
++         debug g => _2;                   // in scope 1 at $DIR/cycle.rs:+0:6: +0:7
++         let _3: ();                      // in scope 1 at $DIR/cycle.rs:+0:5: +0:8
++         let mut _4: &fn() {main};        // in scope 1 at $DIR/cycle.rs:+0:5: +0:6
++         let mut _5: ();                  // in scope 1 at $DIR/cycle.rs:+0:5: +0:8
 +         scope 2 (inlined <fn() {main} as Fn<()>>::call - shim(fn() {main})) { // at $DIR/cycle.rs:6:5: 6:8
 +         }
 +     }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/cycle.rs:12:5: 12:12
--         _1 = f::<fn() {main}>(main) -> bb1; // scope 0 at $DIR/cycle.rs:12:5: 12:12
-+         StorageLive(_2);                 // scope 0 at $DIR/cycle.rs:12:5: 12:12
-+         _2 = main;                       // scope 0 at $DIR/cycle.rs:12:5: 12:12
+          StorageLive(_1);                 // scope 0 at $DIR/cycle.rs:+1:5: +1:12
+-         _1 = f::<fn() {main}>(main) -> bb1; // scope 0 at $DIR/cycle.rs:+1:5: +1:12
++         StorageLive(_2);                 // scope 0 at $DIR/cycle.rs:+1:5: +1:12
++         _2 = main;                       // scope 0 at $DIR/cycle.rs:+1:5: +1:12
                                            // mir::Constant
 -                                          // + span: $DIR/cycle.rs:12:5: 12:6
 -                                          // + literal: Const { ty: fn(fn() {main}) {f::<fn() {main}>}, val: Value(<ZST>) }
 -                                          // mir::Constant
                                            // + span: $DIR/cycle.rs:12:7: 12:11
                                            // + literal: Const { ty: fn() {main}, val: Value(<ZST>) }
-+         StorageLive(_3);                 // scope 1 at $DIR/cycle.rs:6:5: 6:8
-+         StorageLive(_4);                 // scope 1 at $DIR/cycle.rs:6:5: 6:6
-+         _4 = &_2;                        // scope 1 at $DIR/cycle.rs:6:5: 6:6
-+         StorageLive(_5);                 // scope 1 at $DIR/cycle.rs:6:5: 6:8
++         StorageLive(_3);                 // scope 1 at $DIR/cycle.rs:+0:5: +0:8
++         StorageLive(_4);                 // scope 1 at $DIR/cycle.rs:+0:5: +0:6
++         _4 = &_2;                        // scope 1 at $DIR/cycle.rs:+0:5: +0:6
++         StorageLive(_5);                 // scope 1 at $DIR/cycle.rs:+0:5: +0:8
 +         _3 = move (*_4)() -> [return: bb4, unwind: bb2]; // scope 2 at $SRC_DIR/core/src/ops/function.rs:LL:COL
       }
   
       bb1: {
-+         StorageDead(_2);                 // scope 0 at $DIR/cycle.rs:12:5: 12:12
-          StorageDead(_1);                 // scope 0 at $DIR/cycle.rs:12:12: 12:13
-          _0 = const ();                   // scope 0 at $DIR/cycle.rs:11:8: 13:2
-          return;                          // scope 0 at $DIR/cycle.rs:13:2: 13:2
++         StorageDead(_2);                 // scope 0 at $DIR/cycle.rs:+1:5: +1:12
+          StorageDead(_1);                 // scope 0 at $DIR/cycle.rs:+1:12: +1:13
+          _0 = const ();                   // scope 0 at $DIR/cycle.rs:+0:8: +2:2
+          return;                          // scope 0 at $DIR/cycle.rs:+2:2: +2:2
 +     }
 + 
 +     bb2 (cleanup): {
-+         drop(_2) -> bb3;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++         drop(_2) -> bb3;                 // scope 1 at $DIR/cycle.rs:+0:1: +0:2
 +     }
 + 
 +     bb3 (cleanup): {
-+         resume;                          // scope 1 at $DIR/cycle.rs:5:1: 7:2
++         resume;                          // scope 1 at $DIR/cycle.rs:+0:1: +0:2
 +     }
 + 
 +     bb4: {
-+         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:6:7: 6:8
-+         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:6:8: 6:9
-+         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:7:1: 7:2
++         StorageDead(_5);                 // scope 1 at $DIR/cycle.rs:+0:7: +0:8
++         StorageDead(_4);                 // scope 1 at $DIR/cycle.rs:+0:7: +0:8
++         StorageDead(_3);                 // scope 1 at $DIR/cycle.rs:+0:8: +0:9
++         drop(_2) -> bb1;                 // scope 1 at $DIR/cycle.rs:+0:1: +0:2
       }
   }