Skip to content

Commit 8a153cc

Browse files
JakobDegenJakobDegen
committed
Fix tests that were broken by the change to deaggregation in a trivial way.
1 parent 0a39e3c commit 8a153cc

11 files changed

+14
-14
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
(_10.1: bool) = const false; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8484
(_10.2: u32) = const 123_u32; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8585
StorageLive(_11); // scope 6 at $DIR/const_debuginfo.rs:18:9: 18:10
86-
((_11 as Some).0: u16) = const 99_u16; // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
8786
discriminant(_11) = 1; // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
87+
((_11 as Some).0: u16) = const 99_u16; // scope 6 at $DIR/const_debuginfo.rs:18:13: 18:24
8888
StorageLive(_12); // scope 7 at $DIR/const_debuginfo.rs:20:9: 20:10
8989
(_12.0: u32) = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:20:13: 20:35
9090
(_12.1: u32) = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:20:13: 20:35

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
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-
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1918
discriminant(_3) = 1; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
19+
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
2020
- _4 = discriminant(_3); // scope 0 at $DIR/discriminant.rs:11:21: 11:31
2121
- switchInt(move _4) -> [1_isize: bb1, otherwise: bb3]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
2222
+ _4 = const 1_isize; // scope 0 at $DIR/discriminant.rs:11:21: 11:31

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
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-
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
1918
discriminant(_3) = 1; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
19+
((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
2020
- _4 = discriminant(_3); // scope 0 at $DIR/discriminant.rs:11:21: 11:31
2121
- switchInt(move _4) -> [1_isize: bb1, otherwise: bb3]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
2222
+ _4 = const 1_isize; // scope 0 at $DIR/discriminant.rs:11:21: 11:31

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
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-
+ ((_0 as Foo).0: usize) = move _2; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
1413
+ discriminant(_0) = 1; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
14+
+ ((_0 as Foo).0: usize) = move _2; // scope 0 at $DIR/deaggregator_test_enum.rs:8:5: 8:22
1515
StorageDead(_2); // scope 0 at $DIR/deaggregator_test_enum.rs:8:21: 8:22
1616
return; // scope 0 at $DIR/deaggregator_test_enum.rs:9:2: 9:2
1717
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
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-
+ ((_0 as A).0: i32) = move _4; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
2322
+ discriminant(_0) = 0; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
23+
+ ((_0 as A).0: i32) = move _4; // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:9: 11:18
2424
StorageDead(_4); // scope 0 at $DIR/deaggregator_test_enum_2.rs:11:17: 11:18
2525
goto -> bb3; // scope 0 at $DIR/deaggregator_test_enum_2.rs:10:5: 14:6
2626
}
@@ -29,8 +29,8 @@
2929
StorageLive(_5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:16: 13:17
3030
_5 = _2; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:16: 13:17
3131
- _0 = Foo::B(move _5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
32-
+ ((_0 as B).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
3332
+ discriminant(_0) = 1; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
33+
+ ((_0 as B).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:9: 13:18
3434
StorageDead(_5); // scope 0 at $DIR/deaggregator_test_enum_2.rs:13:17: 13:18
3535
goto -> bb3; // scope 0 at $DIR/deaggregator_test_enum_2.rs:10:5: 14:6
3636
}

‎src/test/mir-opt/deaggregator_test_multiple.test.Deaggregator.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +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-
+ ((_2 as A).0: i32) = move _3; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
1817
+ discriminant(_2) = 0; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
18+
+ ((_2 as A).0: i32) = move _3; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:6: 10:15
1919
StorageDead(_3); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:14: 10:15
2020
StorageLive(_4); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2121
StorageLive(_5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:24: 10:25
2222
_5 = _1; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:24: 10:25
2323
- _4 = Foo::A(move _5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
24-
+ ((_4 as A).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2524
+ discriminant(_4) = 0; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
25+
+ ((_4 as A).0: i32) = move _5; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:17: 10:26
2626
StorageDead(_5); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:25: 10:26
2727
_0 = [move _2, move _4]; // scope 0 at $DIR/deaggregator_test_multiple.rs:10:5: 10:27
2828
StorageDead(_4); // scope 0 at $DIR/deaggregator_test_multiple.rs:10:26: 10:27

‎src/test/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ fn main::{closure#0}(_1: Pin<&mut [generator@$DIR/generator-tiny.rs:19:16: 25:6]
4141
bb2: {
4242
StorageLive(_6); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
4343
StorageLive(_7); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
44-
((_0 as Yielded).0: ()) = move _7; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
4544
discriminant(_0) = 0; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
45+
((_0 as Yielded).0: ()) = move _7; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
4646
discriminant((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6]))) = 3; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
4747
return; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18
4848
}

‎src/test/mir-opt/inline/inline_generator.main.Inline.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
+
114114
+ bb6: {
115115
+ StorageDead(_9); // scope 6 at $DIR/inline-generator.rs:15:38: 15:39
116-
+ ((_1 as Yielded).0: i32) = move _8; // scope 6 at $DIR/inline-generator.rs:15:11: 15:39
117116
+ discriminant(_1) = 0; // scope 6 at $DIR/inline-generator.rs:15:11: 15:39
117+
+ ((_1 as Yielded).0: i32) = move _8; // scope 6 at $DIR/inline-generator.rs:15:11: 15:39
118118
+ discriminant((*(_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41]))) = 3; // scope 6 at $DIR/inline-generator.rs:15:11: 15:39
119119
+ goto -> bb1; // scope 0 at $DIR/inline-generator.rs:15:11: 15:39
120120
+ }
@@ -123,8 +123,8 @@
123123
+ StorageLive(_8); // scope 6 at $DIR/inline-generator.rs:15:5: 15:41
124124
+ _10 = move _7; // scope 6 at $DIR/inline-generator.rs:15:5: 15:41
125125
+ StorageDead(_8); // scope 6 at $DIR/inline-generator.rs:15:38: 15:39
126-
+ ((_1 as Complete).0: bool) = move _10; // scope 6 at $DIR/inline-generator.rs:15:41: 15:41
127126
+ discriminant(_1) = 1; // scope 6 at $DIR/inline-generator.rs:15:41: 15:41
127+
+ ((_1 as Complete).0: bool) = move _10; // scope 6 at $DIR/inline-generator.rs:15:41: 15:41
128128
+ discriminant((*(_2.0: &mut [generator@$DIR/inline-generator.rs:15:5: 15:41]))) = 1; // scope 6 at $DIR/inline-generator.rs:15:41: 15:41
129129
+ goto -> bb1; // scope 0 at $DIR/inline-generator.rs:15:41: 15:41
130130
+ }

‎src/test/mir-opt/issues/issue_75439.foo.MatchBranchSimplification.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767

6868
bb7: {
6969
StorageDead(_6); // scope 4 at $DIR/issue-75439.rs:10:35: 10:36
70-
((_0 as Some).0: [u8; 4]) = move _5; // scope 1 at $DIR/issue-75439.rs:10:9: 10:39
7170
discriminant(_0) = 1; // scope 1 at $DIR/issue-75439.rs:10:9: 10:39
71+
((_0 as Some).0: [u8; 4]) = move _5; // scope 1 at $DIR/issue-75439.rs:10:9: 10:39
7272
StorageDead(_5); // scope 1 at $DIR/issue-75439.rs:10:38: 10:39
7373
StorageDead(_4); // scope 1 at $DIR/issue-75439.rs:11:5: 11:6
7474
goto -> bb9; // scope 1 at $DIR/issue-75439.rs:9:5: 13:6

‎src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.mir_map.0.32bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ fn Test::X(_1: usize) -> Test {
44
let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
55

66
bb0: {
7-
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
87
discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
8+
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
99
return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
1010
}
1111
}

‎src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.mir_map.0.64bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ fn Test::X(_1: usize) -> Test {
44
let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
55

66
bb0: {
7-
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
87
discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
8+
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
99
return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13
1010
}
1111
}

0 commit comments

Comments
 (0)