Skip to content

Commit c653af8

Browse files
wesleywiserwesleywiser
committed
Remove unnecessary -Zunsound-mir-opts uses in tests
1 parent b9d0ea9 commit c653af8

13 files changed

+177
-168
lines changed

‎src/test/mir-opt/inline/inline-any-operand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z span_free_formats -Zunsound-mir-opts
1+
// compile-flags: -Z span_free_formats
22

33
// Tests that MIR inliner works for any operand
44

‎src/test/mir-opt/inline/inline-trait-method_2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z span_free_formats -Z mir-opt-level=3 -Zunsound-mir-opts
1+
// compile-flags: -Z span_free_formats -Z mir-opt-level=3
22

33
// EMIT_MIR inline_trait_method_2.test2.Inline.after.mir
44
fn test2(x: &dyn X) -> bool {

‎src/test/mir-opt/inline/inline_any_operand.bar.Inline.after.mir

+18-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ fn bar() -> bool {
44
let mut _0: bool; // return place in scope 0 at $DIR/inline-any-operand.rs:10:13: 10:17
55
let _1: fn(i32, i32) -> bool {foo}; // in scope 0 at $DIR/inline-any-operand.rs:11:9: 11:10
66
let mut _2: fn(i32, i32) -> bool {foo}; // in scope 0 at $DIR/inline-any-operand.rs:12:5: 12:6
7-
let mut _3: i32; // in scope 0 at $DIR/inline-any-operand.rs:12:5: 12:13
8-
let mut _4: i32; // in scope 0 at $DIR/inline-any-operand.rs:12:5: 12:13
7+
let mut _5: i32; // in scope 0 at $DIR/inline-any-operand.rs:12:5: 12:13
8+
let mut _6: i32; // in scope 0 at $DIR/inline-any-operand.rs:12:5: 12:13
99
scope 1 {
1010
debug f => _1; // in scope 1 at $DIR/inline-any-operand.rs:11:9: 11:10
1111
scope 2 {
12-
debug x => _3; // in scope 2 at $DIR/inline-any-operand.rs:16:8: 16:9
13-
debug y => _4; // in scope 2 at $DIR/inline-any-operand.rs:16:16: 16:17
12+
debug x => _5; // in scope 2 at $DIR/inline-any-operand.rs:16:8: 16:9
13+
debug y => _6; // in scope 2 at $DIR/inline-any-operand.rs:16:16: 16:17
14+
let mut _3: i32; // in scope 2 at $DIR/inline-any-operand.rs:12:5: 12:13
15+
let mut _4: i32; // in scope 2 at $DIR/inline-any-operand.rs:12:5: 12:13
1416
}
1517
}
1618

@@ -22,13 +24,19 @@ fn bar() -> bool {
2224
// + literal: Const { ty: fn(i32, i32) -> bool {foo}, val: Value(Scalar(<ZST>)) }
2325
StorageLive(_2); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:6
2426
_2 = _1; // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:6
25-
StorageLive(_3); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
26-
_3 = const 1_i32; // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
27-
StorageLive(_4); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
28-
_4 = const -1_i32; // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
27+
StorageLive(_5); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
28+
_5 = const 1_i32; // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
29+
StorageLive(_6); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
30+
_6 = const -1_i32; // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
31+
StorageLive(_3); // scope 2 at $DIR/inline-any-operand.rs:17:5: 17:6
32+
_3 = _5; // scope 2 at $DIR/inline-any-operand.rs:17:5: 17:6
33+
StorageLive(_4); // scope 2 at $DIR/inline-any-operand.rs:17:10: 17:11
34+
_4 = _6; // scope 2 at $DIR/inline-any-operand.rs:17:10: 17:11
2935
_0 = Eq(move _3, move _4); // scope 2 at $DIR/inline-any-operand.rs:17:5: 17:11
30-
StorageDead(_4); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
31-
StorageDead(_3); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
36+
StorageDead(_4); // scope 2 at $DIR/inline-any-operand.rs:17:10: 17:11
37+
StorageDead(_3); // scope 2 at $DIR/inline-any-operand.rs:17:10: 17:11
38+
StorageDead(_6); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
39+
StorageDead(_5); // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
3240
StorageDead(_2); // scope 1 at $DIR/inline-any-operand.rs:12:12: 12:13
3341
StorageDead(_1); // scope 0 at $DIR/inline-any-operand.rs:13:1: 13:2
3442
return; // scope 0 at $DIR/inline-any-operand.rs:13:2: 13:2

‎src/test/mir-opt/inline/inline_trait_method_2.test2.Inline.after.mir

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ fn test2(_1: &dyn X) -> bool {
77
let mut _3: &dyn X; // in scope 0 at $DIR/inline-trait-method_2.rs:5:10: 5:11
88
scope 1 {
99
debug x => _2; // in scope 1 at $DIR/inline-trait-method_2.rs:9:9: 9:10
10+
let mut _4: &dyn X; // in scope 1 at $DIR/inline-trait-method_2.rs:5:5: 5:12
1011
}
1112

1213
bb0: {
@@ -15,13 +16,16 @@ fn test2(_1: &dyn X) -> bool {
1516
_3 = &(*_1); // scope 0 at $DIR/inline-trait-method_2.rs:5:10: 5:11
1617
_2 = move _3 as &dyn X (Pointer(Unsize)); // scope 0 at $DIR/inline-trait-method_2.rs:5:10: 5:11
1718
StorageDead(_3); // scope 0 at $DIR/inline-trait-method_2.rs:5:10: 5:11
18-
_0 = <dyn X as X>::y(move _2) -> bb1; // scope 1 at $DIR/inline-trait-method_2.rs:10:5: 10:10
19+
StorageLive(_4); // scope 1 at $DIR/inline-trait-method_2.rs:10:5: 10:6
20+
_4 = _2; // scope 1 at $DIR/inline-trait-method_2.rs:10:5: 10:6
21+
_0 = <dyn X as X>::y(move _4) -> bb1; // scope 1 at $DIR/inline-trait-method_2.rs:10:5: 10:10
1922
// mir::Constant
2023
// + span: $DIR/inline-trait-method_2.rs:10:7: 10:8
2124
// + literal: Const { ty: for<'r> fn(&'r dyn X) -> bool {<dyn X as X>::y}, val: Value(Scalar(<ZST>)) }
2225
}
2326

2427
bb1: {
28+
StorageDead(_4); // scope 1 at $DIR/inline-trait-method_2.rs:10:9: 10:10
2529
StorageDead(_2); // scope 0 at $DIR/inline-trait-method_2.rs:5:11: 5:12
2630
return; // scope 0 at $DIR/inline-trait-method_2.rs:6:2: 6:2
2731
}

‎src/test/mir-opt/nrvo-simple.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Zmir-opt-level=1 -Zunsound-mir-opts
1+
// compile-flags: -Zmir-opt-level=1
22

33
// EMIT_MIR nrvo_simple.nrvo.RenameReturnPlace.diff
44
fn nrvo(init: fn(&mut [u8; 1024])) -> [u8; 1024] {

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// compile-flags: -Zunsound-mir-opts
2-
31
fn map(x: Option<Box<()>>) -> Option<Box<()>> {
42
match x {
53
None => None,

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

+15-15
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: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
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
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:6:14: 6:15
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
1515
}
1616

1717
bb0: {
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
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
2424
}
2525
}
2626

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

+15-15
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: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
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
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:6:14: 6:15
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
1515
}
1616

1717
bb0: {
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
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
2424
}
2525
}
2626

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// compile-flags: -Zunsound-mir-opts
21
// EMIT_MIR simplify_try.try_identity.SimplifyArmIdentity.diff
32
// EMIT_MIR simplify_try.try_identity.SimplifyBranchSame.after.mir
43
// EMIT_MIR simplify_try.try_identity.SimplifyLocals.after.mir

0 commit comments

Comments
 (0)