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

diff --git a/src/test/mir-opt/inline/inline_cycle.two.Inline.diff b/src/test/mir-opt/inline/inline_cycle.two.Inline.diff
index 29c793d7bd8..0fea4121f8d 100644
--- a/src/test/mir-opt/inline/inline_cycle.two.Inline.diff
+++ b/src/test/mir-opt/inline/inline_cycle.two.Inline.diff
@@ -2,36 +2,36 @@
 + // MIR for `two` after Inline
   
   fn two() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/inline-cycle.rs:48:10: 48:10
-      let _1: ();                          // in scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
-+     let mut _2: fn() {f};                // in scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
+      let mut _0: ();                      // return place in scope 0 at $DIR/inline-cycle.rs:+0:10: +0:10
+      let _1: ();                          // in scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
++     let mut _2: fn() {f};                // in scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
 +     scope 1 (inlined call::<fn() {f}>) { // at $DIR/inline-cycle.rs:49:5: 49:12
-+         debug f => _2;                   // in scope 1 at $DIR/inline-cycle.rs:53:22: 53:23
-+         let _3: ();                      // in scope 1 at $DIR/inline-cycle.rs:54:5: 54:8
-+         let mut _4: fn() {f};            // in scope 1 at $DIR/inline-cycle.rs:54:5: 54:6
-+         let mut _5: ();                  // in scope 1 at $DIR/inline-cycle.rs:54:5: 54:8
++         debug f => _2;                   // in scope 1 at $DIR/inline-cycle.rs:+5:22: +5:23
++         let _3: ();                      // in scope 1 at $DIR/inline-cycle.rs:+6:5: +6:8
++         let mut _4: fn() {f};            // in scope 1 at $DIR/inline-cycle.rs:+6:5: +6:6
++         let mut _5: ();                  // in scope 1 at $DIR/inline-cycle.rs:+6:5: +6:8
 +         scope 2 (inlined <fn() {f} as FnOnce<()>>::call_once - shim(fn() {f})) { // at $DIR/inline-cycle.rs:54:5: 54:8
 +             scope 3 (inlined f) {        // at $SRC_DIR/core/src/ops/function.rs:LL:COL
-+                 let _6: ();              // in scope 3 at $DIR/inline-cycle.rs:59:5: 59:12
++                 let _6: ();              // in scope 3 at $DIR/inline-cycle.rs:+11:5: +11:12
 +             }
 +         }
 +     }
   
       bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
--         _1 = call::<fn() {f}>(f) -> bb1; // scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
-+         StorageLive(_2);                 // scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
-+         _2 = f;                          // scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
+          StorageLive(_1);                 // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
+-         _1 = call::<fn() {f}>(f) -> bb1; // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
++         StorageLive(_2);                 // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
++         _2 = f;                          // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
                                            // mir::Constant
 -                                          // + span: $DIR/inline-cycle.rs:49:5: 49:9
 +                                          // + span: $DIR/inline-cycle.rs:49:10: 49:11
 +                                          // + literal: Const { ty: fn() {f}, val: Value(<ZST>) }
-+         StorageLive(_3);                 // scope 1 at $DIR/inline-cycle.rs:54:5: 54:8
-+         StorageLive(_4);                 // scope 1 at $DIR/inline-cycle.rs:54:5: 54:6
-+         _4 = move _2;                    // scope 1 at $DIR/inline-cycle.rs:54:5: 54:6
-+         StorageLive(_5);                 // scope 1 at $DIR/inline-cycle.rs:54:5: 54:8
-+         StorageLive(_6);                 // scope 3 at $DIR/inline-cycle.rs:59:5: 59:12
-+         _6 = call::<fn() {f}>(f) -> bb1; // scope 3 at $DIR/inline-cycle.rs:59:5: 59:12
++         StorageLive(_3);                 // scope 1 at $DIR/inline-cycle.rs:+6:5: +6:8
++         StorageLive(_4);                 // scope 1 at $DIR/inline-cycle.rs:+6:5: +6:6
++         _4 = move _2;                    // scope 1 at $DIR/inline-cycle.rs:+6:5: +6:6
++         StorageLive(_5);                 // scope 1 at $DIR/inline-cycle.rs:+6:5: +6:8
++         StorageLive(_6);                 // scope 3 at $DIR/inline-cycle.rs:+11:5: +11:12
++         _6 = call::<fn() {f}>(f) -> bb1; // scope 3 at $DIR/inline-cycle.rs:+11:5: +11:12
 +                                          // mir::Constant
 +                                          // + span: $DIR/inline-cycle.rs:59:5: 59:9
                                            // + literal: Const { ty: fn(fn() {f}) {call::<fn() {f}>}, val: Value(<ZST>) }
@@ -42,18 +42,18 @@
       }
   
       bb1: {
-+         StorageDead(_6);                 // scope 3 at $DIR/inline-cycle.rs:59:12: 59:13
-+         StorageDead(_5);                 // scope 1 at $DIR/inline-cycle.rs:54:7: 54:8
-+         StorageDead(_4);                 // scope 1 at $DIR/inline-cycle.rs:54:7: 54:8
-+         StorageDead(_3);                 // scope 1 at $DIR/inline-cycle.rs:54:8: 54:9
-+         StorageDead(_2);                 // scope 0 at $DIR/inline-cycle.rs:49:5: 49:12
-          StorageDead(_1);                 // scope 0 at $DIR/inline-cycle.rs:49:12: 49:13
-          _0 = const ();                   // scope 0 at $DIR/inline-cycle.rs:48:10: 50:2
-          return;                          // scope 0 at $DIR/inline-cycle.rs:50:2: 50:2
++         StorageDead(_6);                 // scope 3 at $DIR/inline-cycle.rs:+11:12: +11:13
++         StorageDead(_5);                 // scope 1 at $DIR/inline-cycle.rs:+6:7: +6:8
++         StorageDead(_4);                 // scope 1 at $DIR/inline-cycle.rs:+6:7: +6:8
++         StorageDead(_3);                 // scope 1 at $DIR/inline-cycle.rs:+6:8: +6:9
++         StorageDead(_2);                 // scope 0 at $DIR/inline-cycle.rs:+1:5: +1:12
+          StorageDead(_1);                 // scope 0 at $DIR/inline-cycle.rs:+1:12: +1:13
+          _0 = const ();                   // scope 0 at $DIR/inline-cycle.rs:+0:10: +2:2
+          return;                          // scope 0 at $DIR/inline-cycle.rs:+2:2: +2:2
 +     }
 + 
 +     bb2 (cleanup): {
-+         resume;                          // scope 0 at $DIR/inline-cycle.rs:48:1: 50:2
++         resume;                          // scope 0 at $DIR/inline-cycle.rs:+0:1: +2:2
       }
   }