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

Diff for: ‎src/test/codegen/try_identity.rs

+1-1
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)),

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

+1
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
}

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

+1
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

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

+3
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

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

+1
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

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

+1
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

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

+1
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

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

+3
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

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

+2
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

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

+2
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

Diff for: ‎src/test/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
bb0: {
1616
StorageLive(_1); // scope 0 at $DIR/mutable_variable_aggregate.rs:5:9: 5:14
17+
Deinit(_1); // scope 0 at $DIR/mutable_variable_aggregate.rs:5:17: 5:25
1718
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/mutable_variable_aggregate.rs:5:17: 5:25
1819
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/mutable_variable_aggregate.rs:5:17: 5:25
1920
(_1.1: i32) = const 99_i32; // scope 1 at $DIR/mutable_variable_aggregate.rs:6:5: 6:13

Diff for: ‎src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
bb0: {
2020
StorageLive(_1); // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:9: 5:14
21+
Deinit(_1); // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:17: 5:25
2122
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:17: 5:25
2223
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:17: 5:25
2324
StorageLive(_2); // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:6:9: 6:10

Diff for: ‎src/test/mir-opt/const_prop/mutable_variable_unprop_assign.main.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
bb1: {
3333
StorageLive(_2); // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:9: 6:14
34+
Deinit(_2); // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:29: 6:35
3435
(_2.0: i32) = const 1_i32; // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:29: 6:35
3536
(_2.1: i32) = const 2_i32; // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:29: 6:35
3637
StorageLive(_3); // scope 2 at $DIR/mutable_variable_unprop_assign.rs:7:11: 7:12

Diff for: ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
StorageDead(_4); // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
5353
StorageLive(_8); // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
5454
StorageLive(_9); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
55+
Deinit(_9); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5556
(_9.0: u32) = const 12_u32; // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5657
(_9.1: u32) = const 42_u32; // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5758
- _8 = (_9.1: u32); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38

Diff for: ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
StorageDead(_4); // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
5353
StorageLive(_8); // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
5454
StorageLive(_9); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
55+
Deinit(_9); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5556
(_9.0: u32) = const 12_u32; // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5657
(_9.1: u32) = const 42_u32; // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
5758
- _8 = (_9.1: u32); // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38

Diff for: ‎src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
bb0: {
1414
StorageLive(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
15+
Deinit(_1); // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
1516
(_1.0: u32) = const 1_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
1617
(_1.1: u32) = const 2_u32; // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
1718
StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15

Diff for: ‎src/test/mir-opt/const_prop_miscompile.bar.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
bb0: {
2121
StorageLive(_1); // scope 0 at $DIR/const_prop_miscompile.rs:12:9: 12:14
22+
Deinit(_1); // scope 0 at $DIR/const_prop_miscompile.rs:12:17: 12:21
2223
(_1.0: i32) = const 1_i32; // scope 0 at $DIR/const_prop_miscompile.rs:12:17: 12:21
2324
StorageLive(_2); // scope 1 at $DIR/const_prop_miscompile.rs:13:5: 15:6
2425
StorageLive(_3); // scope 2 at $DIR/const_prop_miscompile.rs:14:10: 14:22

Diff for: ‎src/test/mir-opt/const_prop_miscompile.foo.ConstProp.diff

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
bb0: {
1818
StorageLive(_1); // scope 0 at $DIR/const_prop_miscompile.rs:5:9: 5:14
19+
Deinit(_1); // scope 0 at $DIR/const_prop_miscompile.rs:5:17: 5:21
1920
(_1.0: i32) = const 1_i32; // scope 0 at $DIR/const_prop_miscompile.rs:5:17: 5:21
2021
StorageLive(_2); // scope 1 at $DIR/const_prop_miscompile.rs:6:6: 6:14
2122
_2 = &mut (_1.0: i32); // scope 1 at $DIR/const_prop_miscompile.rs:6:6: 6:14

Diff for: ‎src/test/mir-opt/deaggregator_test.bar.Deaggregator.diff

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
StorageLive(_2); // scope 0 at $DIR/deaggregator_test.rs:9:14: 9:15
1111
_2 = _1; // scope 0 at $DIR/deaggregator_test.rs:9:14: 9:15
1212
- _0 = Baz { x: move _2, y: const 0f32, z: const false }; // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35
13+
+ Deinit(_0); // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35
1314
+ (_0.0: usize) = move _2; // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35
1415
+ (_0.1: f32) = const 0f32; // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35
1516
+ (_0.2: bool) = const false; // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35

Diff for: ‎src/test/mir-opt/deaggregator_test_enum.bar.Deaggregator.diff

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
StorageLive(_2); // scope 0 at $DIR/deaggregator_test_enum.rs:8:19: 8:20
1111
_2 = _1; // scope 0 at $DIR/deaggregator_test_enum.rs:8:19: 8:20
1212
- _0 = Baz::Foo { x: move _2 }; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
13+
+ Deinit(_0); // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
1314
+ ((_0 as Foo).0: usize) = move _2; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
1415
+ discriminant(_0) = 1; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
1516
StorageDead(_2); // scope 0 at $DIR/deaggregator_test_enum.rs:8:21: 8:22

Diff for: ‎src/test/mir-opt/deaggregator_test_enum_2.test1.Deaggregator.diff

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
StorageLive(_4); // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:16: 11:17
2020
_4 = _2; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:16: 11:17
2121
- _0 = Foo::A(move _4); // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
22+
+ Deinit(_0); // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
2223
+ ((_0 as A).0: i32) = move _4; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
2324
+ discriminant(_0) = 0; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
2425
StorageDead(_4); // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:17: 11:18
@@ -29,6 +30,7 @@
2930
StorageLive(_5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:16: 13:17
3031
_5 = _2; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:16: 13:17
3132
- _0 = Foo::B(move _5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
33+
+ Deinit(_0); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
3234
+ ((_0 as B).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
3335
+ discriminant(_0) = 1; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
3436
StorageDead(_5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:17: 13:18

Diff for: ‎src/test/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff

+2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
StorageLive(_3); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:13: 10:14
1515
_3 = _1; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:13: 10:14
1616
- _2 = Foo::A(move _3); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
17+
+ Deinit(_2); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
1718
+ ((_2 as A).0: i32) = move _3; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
1819
+ discriminant(_2) = 0; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
1920
StorageDead(_3); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:14: 10:15
2021
StorageLive(_4); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2122
StorageLive(_5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:24: 10:25
2223
_5 = _1; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:24: 10:25
2324
- _4 = Foo::A(move _5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
25+
+ Deinit(_4); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2426
+ ((_4 as A).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2527
+ discriminant(_4) = 0; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2628
StorageDead(_5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:25: 10:26

Diff for: ‎src/test/mir-opt/dest-prop/union.main.DestinationPropagation.diff

+7-12
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,24 @@
1717
}
1818

1919
bb0: {
20-
- StorageLive(_1); // scope 0 at $DIR/union.rs:13:9: 13:11
21-
- StorageLive(_2); // scope 0 at $DIR/union.rs:13:23: 13:28
22-
- _2 = val() -> bb1; // scope 0 at $DIR/union.rs:13:23: 13:28
23-
+ nop; // scope 0 at $DIR/union.rs:13:9: 13:11
24-
+ nop; // scope 0 at $DIR/union.rs:13:23: 13:28
25-
+ (_1.0: u32) = val() -> bb1; // scope 0 at $DIR/union.rs:13:23: 13:28
20+
StorageLive(_1); // scope 0 at $DIR/union.rs:13:9: 13:11
21+
StorageLive(_2); // scope 0 at $DIR/union.rs:13:23: 13:28
22+
_2 = val() -> bb1; // scope 0 at $DIR/union.rs:13:23: 13:28
2623
// mir::Constant
2724
// + span: $DIR/union.rs:13:23: 13:26
2825
// + literal: Const { ty: fn() -> u32 {val}, val: Value(Scalar(<ZST>)) }
2926
}
3027

3128
bb1: {
32-
- (_1.0: u32) = move _2; // scope 0 at $DIR/union.rs:13:14: 13:30
33-
- StorageDead(_2); // scope 0 at $DIR/union.rs:13:29: 13:30
34-
+ nop; // scope 0 at $DIR/union.rs:13:14: 13:30
35-
+ nop; // scope 0 at $DIR/union.rs:13:29: 13:30
29+
Deinit(_1); // scope 0 at $DIR/union.rs:13:14: 13:30
30+
(_1.0: u32) = move _2; // scope 0 at $DIR/union.rs:13:14: 13:30
31+
StorageDead(_2); // scope 0 at $DIR/union.rs:13:29: 13:30
3632
StorageLive(_3); // scope 1 at $DIR/union.rs:15:5: 15:27
3733
StorageLive(_4); // scope 1 at $DIR/union.rs:15:10: 15:26
3834
_4 = (_1.0: u32); // scope 2 at $DIR/union.rs:15:19: 15:24
3935
StorageDead(_4); // scope 1 at $DIR/union.rs:15:26: 15:27
4036
StorageDead(_3); // scope 1 at $DIR/union.rs:15:27: 15:28
41-
- StorageDead(_1); // scope 0 at $DIR/union.rs:16:1: 16:2
42-
+ nop; // scope 0 at $DIR/union.rs:16:1: 16:2
37+
StorageDead(_1); // scope 0 at $DIR/union.rs:16:1: 16:2
4338
return; // scope 0 at $DIR/union.rs:16:2: 16:2
4439
}
4540
}

0 commit comments

Comments
 (0)