Skip to content

Commit 2b641de

Browse files
jonas-schievinktmiasko
jonas-schievink
authored and
tmiasko
committed
Bless mir-opt tests
1 parent 4893c11 commit 2b641de

7 files changed

+28
-56
lines changed

‎src/test/mir-opt/simplify_arm.id.SimplifyArmIdentity.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,15 @@
1414

1515
bb0: {
1616
_2 = discriminant(_1); // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
17-
switchInt(move _2) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
17+
switchInt(move _2) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
1818
}
1919

2020
bb1: {
2121
discriminant(_0) = 0; // scope 0 at $DIR/simplify-arm.rs:12:17: 12:21
22-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
22+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
2323
}
2424

2525
bb2: {
26-
unreachable; // scope 0 at $DIR/simplify-arm.rs:10:11: 10:12
27-
}
28-
29-
bb3: {
3026
- StorageLive(_3); // scope 0 at $DIR/simplify-arm.rs:11:14: 11:15
3127
- _3 = ((_1 as Some).0: u8); // scope 0 at $DIR/simplify-arm.rs:11:14: 11:15
3228
- StorageLive(_4); // scope 1 at $DIR/simplify-arm.rs:11:25: 11:26
@@ -36,10 +32,10 @@
3632
- StorageDead(_4); // scope 1 at $DIR/simplify-arm.rs:11:26: 11:27
3733
- StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:11:26: 11:27
3834
+ _0 = move _1; // scope 1 at $DIR/simplify-arm.rs:11:20: 11:27
39-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
35+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
4036
}
4137

42-
bb4: {
38+
bb3: {
4339
return; // scope 0 at $DIR/simplify-arm.rs:14:2: 14:2
4440
}
4541
}

‎src/test/mir-opt/simplify_arm.id.SimplifyBranchSame.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,22 @@
1313

1414
bb0: {
1515
_2 = discriminant(_1); // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
16-
- switchInt(move _2) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
16+
- switchInt(move _2) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
1717
+ goto -> bb1; // scope 0 at $DIR/simplify-arm.rs:11:9: 11:16
1818
}
1919

2020
bb1: {
2121
- discriminant(_0) = 0; // scope 0 at $DIR/simplify-arm.rs:12:17: 12:21
22-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
22+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
2323
- }
2424
-
2525
- bb2: {
26-
- unreachable; // scope 0 at $DIR/simplify-arm.rs:10:11: 10:12
27-
- }
28-
-
29-
- bb3: {
3026
_0 = move _1; // scope 1 at $DIR/simplify-arm.rs:11:20: 11:27
31-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
27+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
3228
+ goto -> bb2; // scope 0 at $DIR/simplify-arm.rs:10:5: 13:6
3329
}
3430

35-
- bb4: {
31+
- bb3: {
3632
+ bb2: {
3733
return; // scope 0 at $DIR/simplify-arm.rs:14:2: 14:2
3834
}

‎src/test/mir-opt/simplify_arm.id_result.SimplifyArmIdentity.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
bb0: {
2222
_2 = discriminant(_1); // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
23-
switchInt(move _2) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
23+
switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
2424
}
2525

2626
bb1: {
@@ -33,14 +33,10 @@
3333
- StorageDead(_6); // scope 2 at $DIR/simplify-arm.rs:19:24: 19:25
3434
- StorageDead(_5); // scope 0 at $DIR/simplify-arm.rs:19:24: 19:25
3535
+ _0 = move _1; // scope 2 at $DIR/simplify-arm.rs:19:19: 19:25
36-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
36+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
3737
}
3838

3939
bb2: {
40-
unreachable; // scope 0 at $DIR/simplify-arm.rs:17:11: 17:12
41-
}
42-
43-
bb3: {
4440
- StorageLive(_3); // scope 0 at $DIR/simplify-arm.rs:18:12: 18:13
4541
- _3 = ((_1 as Ok).0: u8); // scope 0 at $DIR/simplify-arm.rs:18:12: 18:13
4642
- StorageLive(_4); // scope 1 at $DIR/simplify-arm.rs:18:21: 18:22
@@ -50,10 +46,10 @@
5046
- StorageDead(_4); // scope 1 at $DIR/simplify-arm.rs:18:22: 18:23
5147
- StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:18:22: 18:23
5248
+ _0 = move _1; // scope 1 at $DIR/simplify-arm.rs:18:18: 18:23
53-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
49+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
5450
}
5551

56-
bb4: {
52+
bb3: {
5753
return; // scope 0 at $DIR/simplify-arm.rs:21:2: 21:2
5854
}
5955
}

‎src/test/mir-opt/simplify_arm.id_result.SimplifyBranchSame.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,22 @@
1818

1919
bb0: {
2020
_2 = discriminant(_1); // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
21-
- switchInt(move _2) -> [0_isize: bb3, 1_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
21+
- switchInt(move _2) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
2222
+ goto -> bb1; // scope 0 at $DIR/simplify-arm.rs:18:9: 18:14
2323
}
2424

2525
bb1: {
2626
- _0 = move _1; // scope 2 at $DIR/simplify-arm.rs:19:19: 19:25
27-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
27+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
2828
- }
2929
-
3030
- bb2: {
31-
- unreachable; // scope 0 at $DIR/simplify-arm.rs:17:11: 17:12
32-
- }
33-
-
34-
- bb3: {
3531
_0 = move _1; // scope 1 at $DIR/simplify-arm.rs:18:18: 18:23
36-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
32+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
3733
+ goto -> bb2; // scope 0 at $DIR/simplify-arm.rs:17:5: 20:6
3834
}
3935

40-
- bb4: {
36+
- bb3: {
4137
+ bb2: {
4238
return; // scope 0 at $DIR/simplify-arm.rs:21:2: 21:2
4339
}

‎src/test/mir-opt/simplify_arm.id_try.SimplifyArmIdentity.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
_3 = move _4; // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
5252
StorageDead(_4); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
5353
_5 = discriminant(_3); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
54-
switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
54+
switchInt(move _5) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
5555
}
5656

5757
bb1: {
@@ -67,14 +67,10 @@
6767
- discriminant(_0) = 0; // scope 1 at $DIR/simplify-arm.rs:25:5: 25:10
6868
- StorageDead(_11); // scope 1 at $DIR/simplify-arm.rs:25:9: 25:10
6969
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
70-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
70+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
7171
}
7272

7373
bb2: {
74-
unreachable; // scope 0 at $DIR/simplify-arm.rs:24:13: 24:15
75-
}
76-
77-
bb3: {
7874
- StorageLive(_6); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
7975
- _6 = ((_3 as Err).0: i32); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
8076
- StorageLive(_8); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
@@ -92,10 +88,10 @@
9288
+ _0 = move _3; // scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
9389
StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
9490
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
95-
goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
91+
goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
9692
}
9793

98-
bb4: {
94+
bb3: {
9995
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
10096
}
10197
}

‎src/test/mir-opt/simplify_arm.id_try.SimplifyBranchSame.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,26 @@
4646
_3 = move _4; // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
4747
StorageDead(_4); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
4848
_5 = discriminant(_3); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
49-
- switchInt(move _5) -> [0_isize: bb1, 1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
49+
- switchInt(move _5) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
5050
+ goto -> bb1; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
5151
}
5252

5353
bb1: {
5454
_0 = move _3; // scope 1 at $DIR/simplify-arm.rs:25:5: 25:10
5555
StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
5656
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
57-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
57+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
5858
+ goto -> bb2; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
5959
}
6060

6161
bb2: {
62-
- unreachable; // scope 0 at $DIR/simplify-arm.rs:24:13: 24:15
63-
- }
64-
-
65-
- bb3: {
6662
- _0 = move _3; // scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
6763
- StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
6864
- StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
69-
- goto -> bb4; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
65+
- goto -> bb3; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
7066
- }
7167
-
72-
- bb4: {
68+
- bb3: {
7369
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
7470
}
7571
}

‎src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.64bit.diff

+4-8
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,16 @@
2323
discriminant(_1) = 0; // scope 0 at $DIR/simplify-arm-identity.rs:18:18: 18:29
2424
StorageLive(_2); // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
2525
_3 = const 0_isize; // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
26-
goto -> bb3; // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
26+
goto -> bb2; // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
2727
}
2828

2929
bb1: {
3030
((_2 as Foo).0: u8) = const 0_u8; // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
3131
discriminant(_2) = 0; // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
32-
goto -> bb4; // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
32+
goto -> bb3; // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
3333
}
3434

3535
bb2: {
36-
unreachable; // scope 1 at $DIR/simplify-arm-identity.rs:19:24: 19:25
37-
}
38-
39-
bb3: {
4036
StorageLive(_4); // scope 1 at $DIR/simplify-arm-identity.rs:20:18: 20:19
4137
_4 = ((_1 as Foo).0: u8); // scope 1 at $DIR/simplify-arm-identity.rs:20:18: 20:19
4238
StorageLive(_5); // scope 3 at $DIR/simplify-arm-identity.rs:20:33: 20:34
@@ -45,10 +41,10 @@
4541
discriminant(_2) = 0; // scope 3 at $DIR/simplify-arm-identity.rs:20:24: 20:35
4642
StorageDead(_5); // scope 3 at $DIR/simplify-arm-identity.rs:20:34: 20:35
4743
StorageDead(_4); // scope 1 at $DIR/simplify-arm-identity.rs:20:34: 20:35
48-
goto -> bb4; // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
44+
goto -> bb3; // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
4945
}
5046

51-
bb4: {
47+
bb3: {
5248
StorageDead(_2); // scope 1 at $DIR/simplify-arm-identity.rs:22:6: 22:7
5349
_0 = const (); // scope 0 at $DIR/simplify-arm-identity.rs:17:11: 23:2
5450
StorageDead(_1); // scope 0 at $DIR/simplify-arm-identity.rs:23:1: 23:2

0 commit comments

Comments
 (0)