Skip to content

Commit 4dedf5e

Browse files
borsbors
committed
Auto merge of #77396 - wesleywiser:disable-simplifyarmidentity, r=oli-obk
Disable the SimplifyArmIdentity mir-opt The optimization still has some bugs that need to be worked out such as #77359. We can try re-enabling this again after the known issues are resolved. r? `@oli-obk`
2 parents 154f1f5 + f9d7720 commit 4dedf5e

13 files changed

+195
-152
lines changed

‎compiler/rustc_mir/src/transform/simplify_try.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,12 @@ fn optimization_applies<'tcx>(
367367
}
368368

369369
impl<'tcx> MirPass<'tcx> for SimplifyArmIdentity {
370-
fn run_pass(&self, _tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, body: &mut Body<'tcx>) {
370+
fn run_pass(&self, tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, body: &mut Body<'tcx>) {
371+
// FIXME(77359): This optimization can result in unsoundness.
372+
if !tcx.sess.opts.debugging_opts.unsound_mir_opts {
373+
return;
374+
}
375+
371376
trace!("running SimplifyArmIdentity on {:?}", source);
372377
let local_uses = LocalUseCounter::get_local_uses(body);
373378
let (basic_blocks, local_decls, debug_info) =

‎src/test/codegen/try_identity.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -C no-prepopulate-passes -Z mir-opt-level=2
1+
// compile-flags: -C no-prepopulate-passes -Z mir-opt-level=2 -Zunsound-mir-opts
22

33
// Ensure that `x?` has no overhead on `Result<T, E>` due to identity `match`es in lowering.
44
// This requires inlining to trigger the MIR optimizations in `SimplifyArmIdentity`.

‎src/test/mir-opt/simplify-arm.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z mir-opt-level=2
1+
// compile-flags: -Z mir-opt-level=2 -Zunsound-mir-opts
22
// EMIT_MIR simplify_arm.id.SimplifyArmIdentity.diff
33
// EMIT_MIR simplify_arm.id.SimplifyBranchSame.diff
44
// EMIT_MIR simplify_arm.id_result.SimplifyArmIdentity.diff

‎src/test/mir-opt/simplify-locals-removes-unused-discriminant-reads.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// compile-flags: -Zunsound-mir-opts
2+
13
fn map(x: Option<Box<()>>) -> Option<Box<()>> {
24
match x {
35
None => None,

‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
+ // MIR for `map` after SimplifyLocals
33

44
fn map(_1: Option<Box<()>>) -> Option<Box<()>> {
5-
debug x => _1; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:1:8: 1:9
6-
let mut _0: std::option::Option<std::boxed::Box<()>>; // return place in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:1:31: 1:46
7-
- let mut _2: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
8-
- let _3: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:14: 4:15
9-
- let mut _4: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:25: 4:26
10-
- let mut _5: bool; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
11-
- let mut _6: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
12-
- let mut _7: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
5+
debug x => _1; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:8: 3:9
6+
let mut _0: std::option::Option<std::boxed::Box<()>>; // return place in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:31: 3:46
7+
- let mut _2: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
8+
- let _3: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:14: 6:15
9+
- let mut _4: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:25: 6:26
10+
- let mut _5: bool; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
11+
- let mut _6: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
12+
- let mut _7: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
1313
scope 1 {
14-
debug x => ((_0 as Some).0: std::boxed::Box<()>); // in scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:14: 4:15
14+
debug x => ((_0 as Some).0: std::boxed::Box<()>); // in scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:14: 6:15
1515
}
1616

1717
bb0: {
18-
- _5 = const false; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
19-
- _5 = const true; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
20-
- _2 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
21-
_0 = move _1; // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:20: 4:27
22-
- _6 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
23-
return; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:2: 6:2
18+
- _5 = const false; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
19+
- _5 = const true; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
20+
- _2 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
21+
_0 = move _1; // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:20: 6:27
22+
- _6 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
23+
return; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:2: 8:2
2424
}
2525
}
2626

‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.64bit.diff‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
+ // MIR for `map` after SimplifyLocals
33

44
fn map(_1: Option<Box<()>>) -> Option<Box<()>> {
5-
debug x => _1; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:1:8: 1:9
6-
let mut _0: std::option::Option<std::boxed::Box<()>>; // return place in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:1:31: 1:46
7-
- let mut _2: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
8-
- let _3: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:14: 4:15
9-
- let mut _4: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:25: 4:26
10-
- let mut _5: bool; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
11-
- let mut _6: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
12-
- let mut _7: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
5+
debug x => _1; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:8: 3:9
6+
let mut _0: std::option::Option<std::boxed::Box<()>>; // return place in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:31: 3:46
7+
- let mut _2: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
8+
- let _3: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:14: 6:15
9+
- let mut _4: std::boxed::Box<()>; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:25: 6:26
10+
- let mut _5: bool; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
11+
- let mut _6: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
12+
- let mut _7: isize; // in scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
1313
scope 1 {
14-
debug x => ((_0 as Some).0: std::boxed::Box<()>); // in scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:14: 4:15
14+
debug x => ((_0 as Some).0: std::boxed::Box<()>); // in scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:14: 6:15
1515
}
1616

1717
bb0: {
18-
- _5 = const false; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
19-
- _5 = const true; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
20-
- _2 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
21-
_0 = move _1; // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:20: 4:27
22-
- _6 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
23-
return; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:2: 6:2
18+
- _5 = const false; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
19+
- _5 = const true; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
20+
- _2 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:5:9: 5:13
21+
_0 = move _1; // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:20: 6:27
22+
- _6 = discriminant(_1); // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:1: 8:2
23+
return; // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:8:2: 8:2
2424
}
2525
}
2626

‎src/test/mir-opt/simplify_try.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// compile-flags: -Zunsound-mir-opts
12
// EMIT_MIR simplify_try.try_identity.SimplifyArmIdentity.diff
23
// EMIT_MIR simplify_try.try_identity.SimplifyBranchSame.after.mir
34
// EMIT_MIR simplify_try.try_identity.SimplifyLocals.after.mir

‎src/test/mir-opt/simplify_try.try_identity.DestinationPropagation.diff‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
+ // MIR for `try_identity` after DestinationPropagation
33

44
fn try_identity(_1: std::result::Result<u32, i32>) -> std::result::Result<u32, i32> {
5-
debug x => _1; // in scope 0 at $DIR/simplify_try.rs:6:17: 6:18
6-
let mut _0: std::result::Result<u32, i32>; // return place in scope 0 at $DIR/simplify_try.rs:6:41: 6:57
7-
let _2: u32; // in scope 0 at $DIR/simplify_try.rs:7:9: 7:10
8-
let mut _3: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:7:13: 7:15
9-
let mut _4: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:7:13: 7:14
10-
let mut _5: isize; // in scope 0 at $DIR/simplify_try.rs:7:14: 7:15
11-
let _6: i32; // in scope 0 at $DIR/simplify_try.rs:7:14: 7:15
12-
let mut _7: !; // in scope 0 at $DIR/simplify_try.rs:7:14: 7:15
13-
let mut _8: i32; // in scope 0 at $DIR/simplify_try.rs:7:14: 7:15
14-
let mut _9: i32; // in scope 0 at $DIR/simplify_try.rs:7:14: 7:15
15-
let _10: u32; // in scope 0 at $DIR/simplify_try.rs:7:13: 7:15
16-
let mut _11: u32; // in scope 0 at $DIR/simplify_try.rs:8:8: 8:9
5+
debug x => _1; // in scope 0 at $DIR/simplify_try.rs:7:17: 7:18
6+
let mut _0: std::result::Result<u32, i32>; // return place in scope 0 at $DIR/simplify_try.rs:7:41: 7:57
7+
let _2: u32; // in scope 0 at $DIR/simplify_try.rs:8:9: 8:10
8+
let mut _3: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:8:13: 8:15
9+
let mut _4: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:8:13: 8:14
10+
let mut _5: isize; // in scope 0 at $DIR/simplify_try.rs:8:14: 8:15
11+
let _6: i32; // in scope 0 at $DIR/simplify_try.rs:8:14: 8:15
12+
let mut _7: !; // in scope 0 at $DIR/simplify_try.rs:8:14: 8:15
13+
let mut _8: i32; // in scope 0 at $DIR/simplify_try.rs:8:14: 8:15
14+
let mut _9: i32; // in scope 0 at $DIR/simplify_try.rs:8:14: 8:15
15+
let _10: u32; // in scope 0 at $DIR/simplify_try.rs:8:13: 8:15
16+
let mut _11: u32; // in scope 0 at $DIR/simplify_try.rs:9:8: 9:9
1717
scope 1 {
18-
debug y => ((_0 as Ok).0: u32); // in scope 1 at $DIR/simplify_try.rs:7:9: 7:10
18+
debug y => ((_0 as Ok).0: u32); // in scope 1 at $DIR/simplify_try.rs:8:9: 8:10
1919
}
2020
scope 2 {
21-
debug err => ((_0 as Err).0: i32); // in scope 2 at $DIR/simplify_try.rs:7:14: 7:15
21+
debug err => ((_0 as Err).0: i32); // in scope 2 at $DIR/simplify_try.rs:8:14: 8:15
2222
scope 3 {
2323
scope 7 {
2424
debug t => ((_0 as Err).0: i32); // in scope 7 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
2525
}
2626
scope 8 {
2727
debug v => ((_0 as Err).0: i32); // in scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
28-
let mut _12: i32; // in scope 8 at $DIR/simplify_try.rs:7:14: 7:15
28+
let mut _12: i32; // in scope 8 at $DIR/simplify_try.rs:8:14: 8:15
2929
}
3030
}
3131
}
3232
scope 4 {
33-
debug val => ((_0 as Ok).0: u32); // in scope 4 at $DIR/simplify_try.rs:7:13: 7:15
33+
debug val => ((_0 as Ok).0: u32); // in scope 4 at $DIR/simplify_try.rs:8:13: 8:15
3434
scope 5 {
3535
}
3636
}
@@ -40,29 +40,29 @@
4040
}
4141

4242
bb0: {
43-
StorageLive(_2); // scope 0 at $DIR/simplify_try.rs:7:9: 7:10
44-
- StorageLive(_3); // scope 0 at $DIR/simplify_try.rs:7:13: 7:15
45-
- StorageLive(_4); // scope 0 at $DIR/simplify_try.rs:7:13: 7:14
46-
- _4 = _1; // scope 0 at $DIR/simplify_try.rs:7:13: 7:14
43+
StorageLive(_2); // scope 0 at $DIR/simplify_try.rs:8:9: 8:10
44+
- StorageLive(_3); // scope 0 at $DIR/simplify_try.rs:8:13: 8:15
45+
- StorageLive(_4); // scope 0 at $DIR/simplify_try.rs:8:13: 8:14
46+
- _4 = _1; // scope 0 at $DIR/simplify_try.rs:8:13: 8:14
4747
- _3 = move _4; // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
48-
- StorageDead(_4); // scope 0 at $DIR/simplify_try.rs:7:14: 7:15
49-
- _5 = discriminant(_3); // scope 0 at $DIR/simplify_try.rs:7:14: 7:15
50-
+ nop; // scope 0 at $DIR/simplify_try.rs:7:13: 7:15
51-
+ nop; // scope 0 at $DIR/simplify_try.rs:7:13: 7:14
52-
+ _0 = _1; // scope 0 at $DIR/simplify_try.rs:7:13: 7:14
48+
- StorageDead(_4); // scope 0 at $DIR/simplify_try.rs:8:14: 8:15
49+
- _5 = discriminant(_3); // scope 0 at $DIR/simplify_try.rs:8:14: 8:15
50+
+ nop; // scope 0 at $DIR/simplify_try.rs:8:13: 8:15
51+
+ nop; // scope 0 at $DIR/simplify_try.rs:8:13: 8:14
52+
+ _0 = _1; // scope 0 at $DIR/simplify_try.rs:8:13: 8:14
5353
+ nop; // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
54-
+ nop; // scope 0 at $DIR/simplify_try.rs:7:14: 7:15
55-
+ _5 = discriminant(_0); // scope 0 at $DIR/simplify_try.rs:7:14: 7:15
56-
goto -> bb1; // scope 0 at $DIR/simplify_try.rs:7:14: 7:15
54+
+ nop; // scope 0 at $DIR/simplify_try.rs:8:14: 8:15
55+
+ _5 = discriminant(_0); // scope 0 at $DIR/simplify_try.rs:8:14: 8:15
56+
goto -> bb1; // scope 0 at $DIR/simplify_try.rs:8:14: 8:15
5757
}
5858

5959
bb1: {
60-
- _0 = move _3; // scope 1 at $DIR/simplify_try.rs:8:5: 8:10
61-
- StorageDead(_3); // scope 0 at $DIR/simplify_try.rs:7:15: 7:16
62-
+ nop; // scope 1 at $DIR/simplify_try.rs:8:5: 8:10
63-
+ nop; // scope 0 at $DIR/simplify_try.rs:7:15: 7:16
64-
StorageDead(_2); // scope 0 at $DIR/simplify_try.rs:9:1: 9:2
65-
return; // scope 0 at $DIR/simplify_try.rs:9:2: 9:2
60+
- _0 = move _3; // scope 1 at $DIR/simplify_try.rs:9:5: 9:10
61+
- StorageDead(_3); // scope 0 at $DIR/simplify_try.rs:8:15: 8:16
62+
+ nop; // scope 1 at $DIR/simplify_try.rs:9:5: 9:10
63+
+ nop; // scope 0 at $DIR/simplify_try.rs:8:15: 8:16
64+
StorageDead(_2); // scope 0 at $DIR/simplify_try.rs:10:1: 10:2
65+
return; // scope 0 at $DIR/simplify_try.rs:10:2: 10:2
6666
}
6767
}
6868

0 commit comments

Comments
 (0)