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

Commit 4bed0ec

Browse files
pnkfelixMark-Simulacrum
pnkfelix
authored and
Mark-Simulacrum
committed
further bless tests.
1 parent abdae95 commit 4bed0ec

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎src/test/mir-opt/simplify-arm/rustc.id_try.SimplifyArmIdentity.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
- discriminant(_0) = 0; // scope 1 at $DIR/simplify-arm.rs:25:5: 25:10
6262
- StorageDead(_11); // scope 1 at $DIR/simplify-arm.rs:25:9: 25:10
6363
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
64-
goto -> bb7; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
64+
goto -> bb5; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
6565
}
6666

6767
bb3: {
@@ -74,7 +74,7 @@
7474
StorageLive(_8); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
7575
StorageLive(_9); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
7676
_9 = _6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
77-
_8 = const <i32 as std::convert::From<i32>>::from(move _9) -> bb5; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
77+
_8 = const <i32 as std::convert::From<i32>>::from(move _9) -> bb6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
7878
// ty::Const
7979
// + ty: fn(i32) -> i32 {<i32 as std::convert::From<i32>>::from}
8080
// + val: Value(Scalar(<ZST>))
@@ -84,8 +84,12 @@
8484
}
8585

8686
bb5: {
87+
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
88+
}
89+
90+
bb6: {
8791
StorageDead(_9); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
88-
_0 = const <std::result::Result<u8, i32> as std::ops::Try>::from_error(move _8) -> bb6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
92+
_0 = const <std::result::Result<u8, i32> as std::ops::Try>::from_error(move _8) -> bb7; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
8993
// ty::Const
9094
// + ty: fn(<std::result::Result<u8, i32> as std::ops::Try>::Error) -> std::result::Result<u8, i32> {<std::result::Result<u8, i32> as std::ops::Try>::from_error}
9195
// + val: Value(Scalar(<ZST>))
@@ -94,16 +98,12 @@
9498
// + literal: Const { ty: fn(<std::result::Result<u8, i32> as std::ops::Try>::Error) -> std::result::Result<u8, i32> {<std::result::Result<u8, i32> as std::ops::Try>::from_error}, val: Value(Scalar(<ZST>)) }
9599
}
96100

97-
bb6: {
101+
bb7: {
98102
StorageDead(_8); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
99103
StorageDead(_6); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
100104
StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
101105
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
102-
goto -> bb7; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
103-
}
104-
105-
bb7: {
106-
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
106+
goto -> bb5; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
107107
}
108108
}
109109

‎src/test/mir-opt/simplify-arm/rustc.id_try.SimplifyBranchSame.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
_0 = move _3; // scope 1 at $DIR/simplify-arm.rs:25:5: 25:10
5353
StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
5454
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
55-
goto -> bb7; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
55+
goto -> bb5; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
5656
}
5757

5858
bb3: {
@@ -65,7 +65,7 @@
6565
StorageLive(_8); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
6666
StorageLive(_9); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
6767
_9 = _6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
68-
_8 = const <i32 as std::convert::From<i32>>::from(move _9) -> bb5; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
68+
_8 = const <i32 as std::convert::From<i32>>::from(move _9) -> bb6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
6969
// ty::Const
7070
// + ty: fn(i32) -> i32 {<i32 as std::convert::From<i32>>::from}
7171
// + val: Value(Scalar(<ZST>))
@@ -75,8 +75,12 @@
7575
}
7676

7777
bb5: {
78+
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
79+
}
80+
81+
bb6: {
7882
StorageDead(_9); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
79-
_0 = const <std::result::Result<u8, i32> as std::ops::Try>::from_error(move _8) -> bb6; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
83+
_0 = const <std::result::Result<u8, i32> as std::ops::Try>::from_error(move _8) -> bb7; // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
8084
// ty::Const
8185
// + ty: fn(<std::result::Result<u8, i32> as std::ops::Try>::Error) -> std::result::Result<u8, i32> {<std::result::Result<u8, i32> as std::ops::Try>::from_error}
8286
// + val: Value(Scalar(<ZST>))
@@ -85,16 +89,12 @@
8589
// + literal: Const { ty: fn(<std::result::Result<u8, i32> as std::ops::Try>::Error) -> std::result::Result<u8, i32> {<std::result::Result<u8, i32> as std::ops::Try>::from_error}, val: Value(Scalar(<ZST>)) }
8690
}
8791

88-
bb6: {
92+
bb7: {
8993
StorageDead(_8); // scope 3 at $DIR/simplify-arm.rs:24:14: 24:15
9094
StorageDead(_6); // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
9195
StorageDead(_3); // scope 0 at $DIR/simplify-arm.rs:24:15: 24:16
9296
StorageDead(_2); // scope 0 at $DIR/simplify-arm.rs:26:1: 26:2
93-
goto -> bb7; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
94-
}
95-
96-
bb7: {
97-
return; // scope 0 at $DIR/simplify-arm.rs:26:2: 26:2
97+
goto -> bb5; // scope 0 at $DIR/simplify-arm.rs:24:14: 24:15
9898
}
9999
}
100100

‎src/test/mir-opt/simplify_try/rustc.try_identity.SimplifyArmIdentity.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
+ _0 = move _3; // scope 8 at $SRC_DIR/libcore/result.rs:LL:COL
8484
StorageDead(_3); // scope 0 at $DIR/simplify_try.rs:6:15: 6:16
8585
StorageDead(_2); // scope 0 at $DIR/simplify_try.rs:8:1: 8:2
86-
goto -> bb3; // scope 0 at $DIR/simplify_try.rs:8:2: 8:2
86+
goto -> bb3; // scope 0 at $DIR/simplify_try.rs:6:14: 6:15
8787
}
8888

8989
bb3: {

0 commit comments

Comments
 (0)