about summary refs log tree commit diff
path: root/src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-28 16:22:19 +0000
committerbors <bors@rust-lang.org>2022-07-28 16:22:19 +0000
commit36f4f4aa38563d0c02bbdbbc03fb20145edef567 (patch)
tree9ccd853d5a9097d70f30a26016de023231841a96 /src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff
parente5682615bb4fdb90e3a37b810a1b7bded2a1199e (diff)
parent11c0280798da8f4d65dec25764237d2354e65273 (diff)
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
Diffstat (limited to 'src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff')
-rw-r--r--src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff b/src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff
index 93d77ad40aa..204a1bffc81 100644
--- a/src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff
+++ b/src/test/mir-opt/simplify_locals.expose_addr.SimplifyLocals.diff
@@ -2,20 +2,20 @@
 + // MIR for `expose_addr` after SimplifyLocals
   
   fn expose_addr(_1: *const usize) -> () {
-      debug p => _1;                       // in scope 0 at $DIR/simplify-locals.rs:66:16: 66:17
-      let mut _0: ();                      // return place in scope 0 at $DIR/simplify-locals.rs:66:33: 66:33
-      let _2: usize;                       // in scope 0 at $DIR/simplify-locals.rs:68:5: 68:15
-      let mut _3: *const usize;            // in scope 0 at $DIR/simplify-locals.rs:68:5: 68:6
+      debug p => _1;                       // in scope 0 at $DIR/simplify-locals.rs:+0:16: +0:17
+      let mut _0: ();                      // return place in scope 0 at $DIR/simplify-locals.rs:+0:33: +0:33
+      let _2: usize;                       // in scope 0 at $DIR/simplify-locals.rs:+2:5: +2:15
+      let mut _3: *const usize;            // in scope 0 at $DIR/simplify-locals.rs:+2:5: +2:6
   
       bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/simplify-locals.rs:68:5: 68:15
-          StorageLive(_3);                 // scope 0 at $DIR/simplify-locals.rs:68:5: 68:6
-          _3 = _1;                         // scope 0 at $DIR/simplify-locals.rs:68:5: 68:6
-          _2 = move _3 as usize (PointerExposeAddress); // scope 0 at $DIR/simplify-locals.rs:68:5: 68:15
-          StorageDead(_3);                 // scope 0 at $DIR/simplify-locals.rs:68:14: 68:15
-          StorageDead(_2);                 // scope 0 at $DIR/simplify-locals.rs:68:15: 68:16
-          _0 = const ();                   // scope 0 at $DIR/simplify-locals.rs:66:33: 69:2
-          return;                          // scope 0 at $DIR/simplify-locals.rs:69:2: 69:2
+          StorageLive(_2);                 // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:15
+          StorageLive(_3);                 // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:6
+          _3 = _1;                         // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:6
+          _2 = move _3 as usize (PointerExposeAddress); // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:15
+          StorageDead(_3);                 // scope 0 at $DIR/simplify-locals.rs:+2:14: +2:15
+          StorageDead(_2);                 // scope 0 at $DIR/simplify-locals.rs:+2:15: +2:16
+          _0 = const ();                   // scope 0 at $DIR/simplify-locals.rs:+0:33: +3:2
+          return;                          // scope 0 at $DIR/simplify-locals.rs:+3:2: +3:2
       }
   }