Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 1649895

Browse files
jonas-schievinkjonas-schievink
committed
simplify_try: clean up test
1 parent 43ad8e4 commit 1649895

6 files changed

+157
-158
lines changed

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

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

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

5959
bb1: {
60-
- _0 = move _3; // scope 1 at $DIR/simplify_try.rs:7:5: 7:10
61-
- StorageDead(_3); // scope 0 at $DIR/simplify_try.rs:6:15: 6:16
62-
+ nop; // scope 1 at $DIR/simplify_try.rs:7:5: 7:10
63-
+ nop; // scope 0 at $DIR/simplify_try.rs:6:15: 6:16
64-
StorageDead(_2); // scope 0 at $DIR/simplify_try.rs:8:1: 8:2
65-
goto -> bb2; // scope 0 at $DIR/simplify_try.rs:8:2: 8:2
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+
goto -> bb2; // scope 0 at $DIR/simplify_try.rs:9:2: 9:2
6666
}
6767

6868
bb2: {
69-
return; // scope 0 at $DIR/simplify_try.rs:8:2: 8:2
69+
return; // scope 0 at $DIR/simplify_try.rs:9:2: 9:2
7070
}
7171
}
7272

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// EMIT_MIR simplify_try.try_identity.SimplifyArmIdentity.diff
22
// EMIT_MIR simplify_try.try_identity.SimplifyBranchSame.after.mir
33
// EMIT_MIR simplify_try.try_identity.SimplifyLocals.after.mir
4+
// EMIT_MIR simplify_try.try_identity.DestinationPropagation.diff
45

56
fn try_identity(x: Result<u32, i32>) -> Result<u32, i32> {
67
let y = x?;
@@ -10,5 +11,3 @@ fn try_identity(x: Result<u32, i32>) -> Result<u32, i32> {
1011
fn main() {
1112
let _ = try_identity(Ok(0));
1213
}
13-
14-
// EMIT_MIR simplify_try.try_identity.DestinationPropagation.diff

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

Lines changed: 35 additions & 35 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:5:17: 5:18
6-
let mut _0: std::result::Result<u32, i32>; // return place in scope 0 at $DIR/simplify_try.rs:5:41: 5:57
7-
let _2: u32; // in scope 0 at $DIR/simplify_try.rs:6:9: 6:10
8-
let mut _3: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:6:13: 6:15
9-
let mut _4: std::result::Result<u32, i32>; // in scope 0 at $DIR/simplify_try.rs:6:13: 6:14
10-
let mut _5: isize; // in scope 0 at $DIR/simplify_try.rs:6:14: 6:15
11-
let _6: i32; // in scope 0 at $DIR/simplify_try.rs:6:14: 6:15
12-
let mut _7: !; // in scope 0 at $DIR/simplify_try.rs:6:14: 6:15
13-
let mut _8: i32; // in scope 0 at $DIR/simplify_try.rs:6:14: 6:15
14-
let mut _9: i32; // in scope 0 at $DIR/simplify_try.rs:6:14: 6:15
15-
let _10: u32; // in scope 0 at $DIR/simplify_try.rs:6:13: 6:15
16-
let mut _11: u32; // in scope 0 at $DIR/simplify_try.rs:7:8: 7:9
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
1717
scope 1 {
18-
debug y => ((_0 as Ok).0: u32); // in scope 1 at $DIR/simplify_try.rs:6:9: 6:10
18+
debug y => ((_0 as Ok).0: u32); // in scope 1 at $DIR/simplify_try.rs:7:9: 7:10
1919
}
2020
scope 2 {
21-
debug err => ((_0 as Err).0: i32); // in scope 2 at $DIR/simplify_try.rs:6:14: 6:15
21+
debug err => ((_0 as Err).0: i32); // in scope 2 at $DIR/simplify_try.rs:7:14: 7: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:6:14: 6:15
28+
let mut _12: i32; // in scope 8 at $DIR/simplify_try.rs:7:14: 7:15
2929
}
3030
}
3131
}
3232
scope 4 {
33-
debug val => ((_0 as Ok).0: u32); // in scope 4 at $DIR/simplify_try.rs:6:13: 6:15
33+
debug val => ((_0 as Ok).0: u32); // in scope 4 at $DIR/simplify_try.rs:7:13: 7:15
3434
scope 5 {
3535
}
3636
}
@@ -40,33 +40,33 @@
4040
}
4141

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

5959
bb1: {
60-
- _0 = move _3; // scope 1 at $DIR/simplify_try.rs:7:5: 7:10
61-
- StorageDead(_3); // scope 0 at $DIR/simplify_try.rs:6:15: 6:16
62-
+ nop; // scope 1 at $DIR/simplify_try.rs:7:5: 7:10
63-
+ nop; // scope 0 at $DIR/simplify_try.rs:6:15: 6:16
64-
StorageDead(_2); // scope 0 at $DIR/simplify_try.rs:8:1: 8:2
65-
goto -> bb2; // scope 0 at $DIR/simplify_try.rs:8:2: 8:2
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+
goto -> bb2; // scope 0 at $DIR/simplify_try.rs:9:2: 9:2
6666
}
6767

6868
bb2: {
69-
return; // scope 0 at $DIR/simplify_try.rs:8:2: 8:2
69+
return; // scope 0 at $DIR/simplify_try.rs:9:2: 9:2
7070
}
7171
}
7272

0 commit comments

Comments
 (0)