diff options
| author | bors <bors@rust-lang.org> | 2022-07-28 16:22:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-28 16:22:19 +0000 |
| commit | 36f4f4aa38563d0c02bbdbbc03fb20145edef567 (patch) | |
| tree | 9ccd853d5a9097d70f30a26016de023231841a96 /src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff | |
| parent | e5682615bb4fdb90e3a37b810a1b7bded2a1199e (diff) | |
| parent | 11c0280798da8f4d65dec25764237d2354e65273 (diff) | |
| download | rust-36f4f4aa38563d0c02bbdbbc03fb20145edef567.tar.gz rust-36f4f4aa38563d0c02bbdbbc03fb20145edef567.zip | |
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.d2.SimplifyLocals.diff')
| -rw-r--r-- | src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff b/src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff index 641f64fd9b7..6a89e45843b 100644 --- a/src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff +++ b/src/test/mir-opt/simplify_locals.d2.SimplifyLocals.diff @@ -2,28 +2,28 @@ + // MIR for `d2` after SimplifyLocals fn d2() -> () { - let mut _0: (); // return place in scope 0 at $DIR/simplify-locals.rs:26:9: 26:9 -- let mut _1: E; // in scope 0 at $DIR/simplify-locals.rs:28:22: 28:26 -- let mut _2: (i32, E); // in scope 0 at $DIR/simplify-locals.rs:28:5: 28:17 -- let mut _3: E; // in scope 0 at $DIR/simplify-locals.rs:28:11: 28:15 + let mut _0: (); // return place in scope 0 at $DIR/simplify-locals.rs:+0:9: +0:9 +- let mut _1: E; // in scope 0 at $DIR/simplify-locals.rs:+2:22: +2:26 +- let mut _2: (i32, E); // in scope 0 at $DIR/simplify-locals.rs:+2:5: +2:17 +- let mut _3: E; // in scope 0 at $DIR/simplify-locals.rs:+2:11: +2:15 bb0: { -- StorageLive(_1); // scope 0 at $DIR/simplify-locals.rs:28:22: 28:26 -- Deinit(_1); // scope 0 at $DIR/simplify-locals.rs:28:22: 28:26 -- discriminant(_1) = 1; // scope 0 at $DIR/simplify-locals.rs:28:22: 28:26 -- StorageLive(_2); // scope 0 at $DIR/simplify-locals.rs:28:5: 28:17 -- StorageLive(_3); // scope 0 at $DIR/simplify-locals.rs:28:11: 28:15 -- Deinit(_3); // scope 0 at $DIR/simplify-locals.rs:28:11: 28:15 -- discriminant(_3) = 0; // scope 0 at $DIR/simplify-locals.rs:28:11: 28:15 -- Deinit(_2); // scope 0 at $DIR/simplify-locals.rs:28:6: 28:16 -- (_2.0: i32) = const 10_i32; // scope 0 at $DIR/simplify-locals.rs:28:6: 28:16 -- (_2.1: E) = move _3; // scope 0 at $DIR/simplify-locals.rs:28:6: 28:16 -- StorageDead(_3); // scope 0 at $DIR/simplify-locals.rs:28:15: 28:16 -- (_2.1: E) = move _1; // scope 0 at $DIR/simplify-locals.rs:28:5: 28:26 -- StorageDead(_1); // scope 0 at $DIR/simplify-locals.rs:28:25: 28:26 -- StorageDead(_2); // scope 0 at $DIR/simplify-locals.rs:28:26: 28:27 - _0 = const (); // scope 0 at $DIR/simplify-locals.rs:26:9: 29:2 - return; // scope 0 at $DIR/simplify-locals.rs:29:2: 29:2 +- StorageLive(_1); // scope 0 at $DIR/simplify-locals.rs:+2:22: +2:26 +- Deinit(_1); // scope 0 at $DIR/simplify-locals.rs:+2:22: +2:26 +- discriminant(_1) = 1; // scope 0 at $DIR/simplify-locals.rs:+2:22: +2:26 +- StorageLive(_2); // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:17 +- StorageLive(_3); // scope 0 at $DIR/simplify-locals.rs:+2:11: +2:15 +- Deinit(_3); // scope 0 at $DIR/simplify-locals.rs:+2:11: +2:15 +- discriminant(_3) = 0; // scope 0 at $DIR/simplify-locals.rs:+2:11: +2:15 +- Deinit(_2); // scope 0 at $DIR/simplify-locals.rs:+2:6: +2:16 +- (_2.0: i32) = const 10_i32; // scope 0 at $DIR/simplify-locals.rs:+2:6: +2:16 +- (_2.1: E) = move _3; // scope 0 at $DIR/simplify-locals.rs:+2:6: +2:16 +- StorageDead(_3); // scope 0 at $DIR/simplify-locals.rs:+2:15: +2:16 +- (_2.1: E) = move _1; // scope 0 at $DIR/simplify-locals.rs:+2:5: +2:26 +- StorageDead(_1); // scope 0 at $DIR/simplify-locals.rs:+2:25: +2:26 +- StorageDead(_2); // scope 0 at $DIR/simplify-locals.rs:+2:26: +2:27 + _0 = const (); // scope 0 at $DIR/simplify-locals.rs:+0:9: +3:2 + return; // scope 0 at $DIR/simplify-locals.rs:+3:2: +3:2 } } |