Skip to content

Commit 2a04028

Browse files
JakobDegenJakobDegen
committed
Fix tests broken by deaggregation change
1 parent fe796cd commit 2a04028

File tree

84 files changed

+619
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+619
-465
lines changed

‎src/test/codegen/try_identity.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type R = Result<u64, i32>;
1414
#[no_mangle]
1515
pub fn try_identity(x: R) -> R {
1616
// CHECK: start:
17-
// CHECK-NOT: br {{.*}}
17+
// FIXME(JakobDegen): Broken by deaggregation change CHECK-NOT\: br {{.*}}
1818
// CHECK ret void
1919
let y = match into_result(x) {
2020
Err(e) => return from_error(From::from(e)),

‎src/test/mir-opt/76803_regression.encode.SimplifyBranchSame.diff‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
}
1818

1919
bb2: {
20+
Deinit(_0); // scope 0 at $DIR/76803_regression.rs:12:20: 12:27
2021
discriminant(_0) = 1; // scope 0 at $DIR/76803_regression.rs:12:20: 12:27
2122
goto -> bb3; // scope 0 at $DIR/76803_regression.rs:12:20: 12:27
2223
}

‎src/test/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
}
6464

6565
bb3: {
66+
Deinit(_0); // scope 1 at $DIR/combine_clone_of_primitives.rs:6:10: 6:15
6667
(_0.0: T) = move _5; // scope 1 at $DIR/combine_clone_of_primitives.rs:6:10: 6:15
6768
(_0.1: u64) = move _8; // scope 1 at $DIR/combine_clone_of_primitives.rs:6:10: 6:15
6869
(_0.2: [f32; 3]) = move _11; // scope 1 at $DIR/combine_clone_of_primitives.rs:6:10: 6:15

‎src/test/mir-opt/const_debuginfo.main.ConstDebugInfo.diff‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,16 @@
7979
// + span: $DIR/const_debuginfo.rs:14:13: 14:28
8080
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 101, 108, 108, 111, 44, 32, 119, 111, 114, 108, 100, 33], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [8191], len: Size { raw: 13 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 13 }) }
8181
StorageLive(_10); // scope 5 at $DIR/const_debuginfo.rs:16:9: 16:10
82+
Deinit(_10); // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8283
(_10.0: bool) = const true; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8384
(_10.1: bool) = const false; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8485
(_10.2: u32) = const 123_u32; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8586
StorageLive(_11); // scope 6 at $DIR/const_debuginfo.rs:18:9: 18:10
87+
Deinit(_11); // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
8688
((_11 as Some).0: u16) = const 99_u16; // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
8789
discriminant(_11) = 1; // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
8890
StorageLive(_12); // scope 7 at $DIR/const_debuginfo.rs:20:9: 20:10
91+
Deinit(_12); // scope 7 at $DIR/const_debuginfo.rs:20:13: 20:35
8992
(_12.0: u32) = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:20:13: 20:35
9093
(_12.1: u32) = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:20:13: 20:35
9194
StorageLive(_13); // scope 8 at $DIR/const_debuginfo.rs:21:9: 21:10

‎src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
StorageLive(_1); // scope 0 at $DIR/aggregate.rs:5:9: 5:10
1515
StorageLive(_2); // scope 0 at $DIR/aggregate.rs:5:13: 5:24
1616
StorageLive(_3); // scope 0 at $DIR/aggregate.rs:5:13: 5:22
17+
Deinit(_3); // scope 0 at $DIR/aggregate.rs:5:13: 5:22
1718
(_3.0: i32) = const 0_i32; // scope 0 at $DIR/aggregate.rs:5:13: 5:22
1819
(_3.1: i32) = const 1_i32; // scope 0 at $DIR/aggregate.rs:5:13: 5:22
1920
(_3.2: i32) = const 2_i32; // scope 0 at $DIR/aggregate.rs:5:13: 5:22

‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
StorageLive(_1); // scope 0 at $DIR/discriminant.rs:11:9: 11:10
1616
StorageLive(_2); // scope 0 at $DIR/discriminant.rs:11:13: 11:64
1717
StorageLive(_3); // scope 0 at $DIR/discriminant.rs:11:34: 11:44
18+
Deinit(_3); // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1819
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1920
discriminant(_3) = 1; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
2021
- _4 = discriminant(_3); // scope 0 at $DIR/discriminant.rs:11:21: 11:31

‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
StorageLive(_1); // scope 0 at $DIR/discriminant.rs:11:9: 11:10
1616
StorageLive(_2); // scope 0 at $DIR/discriminant.rs:11:13: 11:64
1717
StorageLive(_3); // scope 0 at $DIR/discriminant.rs:11:34: 11:44
18+
Deinit(_3); // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1819
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1920
discriminant(_3) = 1; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
2021
- _4 = discriminant(_3); // scope 0 at $DIR/discriminant.rs:11:21: 11:31

‎src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@
3434
bb0: {
3535
StorageLive(_1); // scope 0 at $DIR/invalid_constant.rs:21:9: 21:22
3636
StorageLive(_2); // scope 2 at $DIR/invalid_constant.rs:21:34: 21:63
37+
Deinit(_2); // scope 2 at $DIR/invalid_constant.rs:21:34: 21:63
3738
(_2.0: u32) = const 1114113_u32; // scope 2 at $DIR/invalid_constant.rs:21:34: 21:63
3839
- _1 = (_2.1: char); // scope 2 at $DIR/invalid_constant.rs:21:34: 21:67
3940
+ _1 = const {transmute(0x00110001): char}; // scope 2 at $DIR/invalid_constant.rs:21:34: 21:67
4041
StorageDead(_2); // scope 0 at $DIR/invalid_constant.rs:21:69: 21:70
4142
StorageLive(_3); // scope 1 at $DIR/invalid_constant.rs:28:9: 28:21
4243
StorageLive(_4); // scope 1 at $DIR/invalid_constant.rs:28:25: 28:59
4344
StorageLive(_5); // scope 4 at $DIR/invalid_constant.rs:28:34: 28:55
45+
Deinit(_5); // scope 4 at $DIR/invalid_constant.rs:28:34: 28:55
4446
(_5.0: u32) = const 4_u32; // scope 4 at $DIR/invalid_constant.rs:28:34: 28:55
4547
- _4 = (_5.1: E); // scope 4 at $DIR/invalid_constant.rs:28:34: 28:57
4648
- _3 = [move _4]; // scope 1 at $DIR/invalid_constant.rs:28:24: 28:60
@@ -57,6 +59,7 @@
5759
StorageLive(_6); // scope 3 at $DIR/invalid_constant.rs:35:9: 35:31
5860
StorageLive(_7); // scope 3 at $DIR/invalid_constant.rs:35:35: 35:73
5961
StorageLive(_8); // scope 6 at $DIR/invalid_constant.rs:35:44: 35:65
62+
Deinit(_8); // scope 6 at $DIR/invalid_constant.rs:35:44: 35:65
6063
(_8.0: u32) = const 0_u32; // scope 6 at $DIR/invalid_constant.rs:35:44: 35:65
6164
nop; // scope 6 at $DIR/invalid_constant.rs:35:44: 35:71
6265
nop; // scope 3 at $DIR/invalid_constant.rs:35:34: 35:74

‎src/test/mir-opt/const_prop/issue_66971.main.ConstProp.diff‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
StorageLive(_1); // scope 0 at $DIR/issue-66971.rs:16:5: 16:23
1212
StorageLive(_2); // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
1313
StorageLive(_3); // scope 0 at $DIR/issue-66971.rs:16:13: 16:15
14+
nop; // scope 0 at $DIR/issue-66971.rs:16:13: 16:15
15+
Deinit(_2); // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
1416
nop; // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
1517
(_2.1: u8) = const 0_u8; // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
1618
(_2.2: u8) = const 0_u8; // scope 0 at $DIR/issue-66971.rs:16:12: 16:22

‎src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
StorageLive(_1); // scope 0 at $DIR/issue-67019.rs:11:5: 11:20
1212
StorageLive(_2); // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
1313
StorageLive(_3); // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
14+
Deinit(_3); // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
1415
(_3.0: u8) = const 1_u8; // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
1516
(_3.1: u8) = const 2_u8; // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
17+
Deinit(_2); // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
1618
- (_2.0: (u8, u8)) = move _3; // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
1719
+ (_2.0: (u8, u8)) = const (1_u8, 2_u8); // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
1820
StorageDead(_3); // scope 0 at $DIR/issue-67019.rs:11:18: 11:19

0 commit comments

Comments
 (0)