Skip to content

Commit 43fce07

Browse files
matthewjaspermatthewjasper
committed
Update MIR opt tests
1 parent 9185bb3 commit 43fce07

14 files changed

+83
-125
lines changed

‎src/test/mir-opt/combine_array_len.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ fn main() {
2121
// END RUST SOURCE
2222

2323
// START rustc.norm2.InstCombine.before.mir
24-
// _5 = Len(_1);
24+
// _4 = Len(_1);
2525
// ...
26-
// _10 = Len(_1);
26+
// _8 = Len(_1);
2727
// END rustc.norm2.InstCombine.before.mir
2828

2929
// START rustc.norm2.InstCombine.after.mir
30-
// _5 = const 2usize;
30+
// _4 = const 2usize;
3131
// ...
32-
// _10 = const 2usize;
32+
// _8 = const 2usize;
3333
// END rustc.norm2.InstCombine.after.mir

‎src/test/mir-opt/copy_propagation.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,17 @@ fn main() {
2222
// START rustc.test.CopyPropagation.before.mir
2323
// bb0: {
2424
// ...
25-
// _3 = _1;
25+
// _2 = _1;
2626
// ...
27-
// _2 = move _3;
28-
// ...
29-
// _4 = _2;
30-
// _0 = move _4;
27+
// _0 = _2;
3128
// ...
3229
// return;
3330
// }
3431
// END rustc.test.CopyPropagation.before.mir
3532
// START rustc.test.CopyPropagation.after.mir
3633
// bb0: {
3734
// ...
38-
// _0 = move _1;
35+
// _0 = _1;
3936
// ...
4037
// return;
4138
// }

‎src/test/mir-opt/copy_propagation_arg.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,25 +117,23 @@ fn main() {
117117
// START rustc.arg_src.CopyPropagation.before.mir
118118
// bb0: {
119119
// ...
120-
// _3 = _1;
121-
// _2 = move _3;
120+
// _2 = _1;
122121
// ...
123122
// _1 = const 123i32;
124123
// ...
125-
// _4 = _2;
126-
// _0 = move _4;
124+
// _0 = _2;
127125
// ...
128126
// return;
129127
// }
130128
// END rustc.arg_src.CopyPropagation.before.mir
131129
// START rustc.arg_src.CopyPropagation.after.mir
132130
// bb0: {
133131
// ...
134-
// _3 = _1;
132+
// _2 = _1;
135133
// ...
136134
// _1 = const 123i32;
137135
// ...
138-
// _0 = move _3;
136+
// _0 = _2;
139137
// ...
140138
// return;
141139
// }

‎src/test/mir-opt/end_region_5.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6868
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
6969
// fn main::{{closure}}(_1: [closure@NodeId(18) d:&'14s D]) -> i32 {
7070
// let mut _0: i32;
71-
// let mut _2: i32;
7271
//
7372
// bb0: {
74-
// StorageLive(_2);
75-
// _2 = ((*(_1.0: &'14s D)).0: i32);
76-
// _0 = move _2;
77-
// StorageDead(_2);
73+
// _0 = ((*(_1.0: &'14s D)).0: i32);
7874
// return;
7975
// }
8076
// END rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir

‎src/test/mir-opt/end_region_6.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,10 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7070
// ...
7171
// let _2: &'16_0rs D;
7272
// ...
73-
// let mut _3: i32;
7473
// bb0: {
7574
// StorageLive(_2);
7675
// _2 = &'16_0rs (*(_1.0: &'19s D));
77-
// StorageLive(_3);
78-
// _3 = ((*_2).0: i32);
79-
// _0 = move _3;
80-
// StorageDead(_3);
76+
// _0 = ((*_2).0: i32);
8177
// EndRegion('16_0rs);
8278
// StorageDead(_2);
8379
// return;

‎src/test/mir-opt/end_region_7.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,10 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7878
// ...
7979
// let _2: &'16_0rs D;
8080
// ...
81-
// let mut _3: i32;
8281
// bb0: {
8382
// StorageLive(_2);
8483
// _2 = &'16_0rs (_1.0: D);
85-
// StorageLive(_3);
86-
// _3 = ((*_2).0: i32);
87-
// _0 = move _3;
88-
// StorageDead(_3);
84+
// _0 = ((*_2).0: i32);
8985
// EndRegion('16_0rs);
9086
// StorageDead(_2);
9187
// drop(_1) -> [return: bb2, unwind: bb1];

‎src/test/mir-opt/end_region_8.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7676
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
7777
// fn main::{{closure}}(_1: [closure@NodeId(22) r:&'19s D]) -> i32 {
7878
// let mut _0: i32;
79-
// let mut _2: i32;
8079
//
8180
// bb0: {
82-
// StorageLive(_2);
83-
// _2 = ((*(_1.0: &'21_1rs D)).0: i32);
84-
// _0 = move _2;
85-
// StorageDead(_2);
81+
// _0 = ((*(_1.0: &'21_1rs D)).0: i32);
8682
// return;
8783
// }
8884
// }

‎src/test/mir-opt/end_region_destruction_extents_1.rs

Lines changed: 43 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -65,52 +65,45 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
6565

6666
// START rustc.main.QualifyAndPromoteConstants.before.mir
6767
// fn main() -> () {
68-
// let mut _0: ();
68+
// let mut _0: ();
6969
// let mut _1: &'12ds S1;
70-
// let mut _2: &'12ds S1;
71-
// let mut _3: D1<'12ds, '10s>;
70+
// let mut _2: D1<'12ds, '10s>;
71+
// let mut _3: &'12ds S1;
7272
// let mut _4: &'12ds S1;
73-
// let mut _5: &'12ds S1;
74-
// let mut _6: S1;
73+
// let mut _5: S1;
74+
// let mut _6: &'10s S1;
7575
// let mut _7: &'10s S1;
76-
// let mut _8: &'10s S1;
77-
// let mut _9: S1;
78-
//
76+
// let mut _8: S1;
7977
// bb0: {
8078
// StorageLive(_2);
8179
// StorageLive(_3);
8280
// StorageLive(_4);
8381
// StorageLive(_5);
82+
// _5 = S1::{{constructor}}(const "ex1",);
83+
// _4 = &'12ds _5;
84+
// _3 = &'12ds (*_4);
8485
// StorageLive(_6);
85-
// _6 = S1::{{constructor}}(const "ex1",);
86-
// _5 = &'12ds _6;
87-
// _4 = &'12ds (*_5);
8886
// StorageLive(_7);
8987
// StorageLive(_8);
90-
// StorageLive(_9);
91-
// _9 = S1::{{constructor}}(const "dang1",);
92-
// _8 = &'10s _9;
93-
// _7 = &'10s (*_8);
94-
// _3 = D1<'12ds, '10s>::{{constructor}}(move _4, move _7);
88+
// _8 = S1::{{constructor}}(const "dang1",);
89+
// _7 = &'10s _8;
90+
// _6 = &'10s (*_7);
91+
// _2 = D1<'12ds, '10s>::{{constructor}}(move _3, move _6);
9592
// EndRegion('10s);
96-
// StorageDead(_7);
97-
// StorageDead(_4);
98-
// _2 = (_3.0: &'12ds S1);
99-
// _1 = move _2;
100-
// StorageDead(_2);
101-
// drop(_3) -> [return: bb2, unwind: bb1];
93+
// StorageDead(_6);
94+
// StorageDead(_3);
95+
// _1 = (_2.0: &'12ds S1);
96+
// drop(_2) -> [return: bb2, unwind: bb1];
10297
// }
103-
//
10498
// bb1: {
10599
// resume;
106100
// }
107-
//
108101
// bb2: {
109-
// StorageDead(_3);
102+
// StorageDead(_2);
103+
// StorageDead(_7);
110104
// StorageDead(_8);
111-
// StorageDead(_9);
105+
// StorageDead(_4);
112106
// StorageDead(_5);
113-
// StorageDead(_6);
114107
// EndRegion('12ds);
115108
// _0 = ();
116109
// return;
@@ -119,51 +112,44 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
119112
// END rustc.main.QualifyAndPromoteConstants.before.mir
120113

121114
// START rustc.main.QualifyAndPromoteConstants.after.mir
122-
// fn main() -> () {
115+
// fn main() -> (){
123116
// let mut _0: ();
124117
// let mut _1: &'12ds S1;
125-
// let mut _2: &'12ds S1;
126-
// let mut _3: D1<'12ds, '10s>;
118+
// let mut _2: D1<'12ds, '10s>;
119+
// let mut _3: &'12ds S1;
127120
// let mut _4: &'12ds S1;
128-
// let mut _5: &'12ds S1;
129-
// let mut _6: S1;
121+
// let mut _5: S1;
122+
// let mut _6: &'10s S1;
130123
// let mut _7: &'10s S1;
131-
// let mut _8: &'10s S1;
132-
// let mut _9: S1;
133-
// let mut _10: &'10s S1;
134-
// let mut _11: &'12ds S1;
135-
//
124+
// let mut _8: S1;
125+
// let mut _9: &'10s S1;
126+
// let mut _10: &'12ds S1;
136127
// bb0: {
137128
// StorageLive(_2);
138129
// StorageLive(_3);
139130
// StorageLive(_4);
140-
// StorageLive(_5);
141-
// _11 = promoted[1];
142-
// _5 = &'12ds (*_11);
143-
// _4 = &'12ds (*_5);
131+
// _10 = promoted[1];
132+
// _4 = &'12ds (*_10);
133+
// _3 = &'12ds (*_4);
134+
// StorageLive(_6);
144135
// StorageLive(_7);
145-
// StorageLive(_8);
146-
// _10 = promoted[0];
147-
// _8 = &'10s (*_10);
148-
// _7 = &'10s (*_8);
149-
// _3 = D1<'12ds, '10s>::{{constructor}}(move _4, move _7);
136+
// _9 = promoted[0];
137+
// _7 = &'10s (*_9);
138+
// _6 = &'10s (*_7);
139+
// _2 = D1<'12ds, '10s>::{{constructor}}(move _3, move _6);
150140
// EndRegion('10s);
151-
// StorageDead(_7);
152-
// StorageDead(_4);
153-
// _2 = (_3.0: &'12ds S1);
154-
// _1 = move _2;
155-
// StorageDead(_2);
156-
// drop(_3) -> [return: bb2, unwind: bb1];
141+
// StorageDead(_6);
142+
// StorageDead(_3);
143+
// _1 = (_2.0: &'12ds S1);
144+
// drop(_2) -> [return: bb2, unwind: bb1];
157145
// }
158-
//
159146
// bb1: {
160147
// resume;
161148
// }
162-
//
163149
// bb2: {
164-
// StorageDead(_3);
165-
// StorageDead(_8);
166-
// StorageDead(_5);
150+
// StorageDead(_2);
151+
// StorageDead(_7);
152+
// StorageDead(_4);
167153
// EndRegion('12ds);
168154
// _0 = ();
169155
// return;

‎src/test/mir-opt/inline-closure-borrows-arg.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ fn foo<T: Copy>(_t: T, q: &i32) -> i32 {
3838
// ...
3939
// _7 = &(*_2);
4040
// _5 = (move _6, move _7);
41-
// _9 = move (_5.0: &i32);
42-
// _10 = move (_5.1: &i32);
43-
// StorageLive(_8);
44-
// _8 = (*_9);
45-
// _0 = move _8;
41+
// _8 = move (_5.0: &i32);
42+
// _9 = move (_5.1: &i32);
43+
// _0 = (*_8);
4644
// ...
4745
// return;
4846
// }

‎src/test/mir-opt/inline-closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn foo<T: Copy>(_t: T, q: i32) -> i32 {
3636
// _5 = (move _6, move _7);
3737
// _8 = move (_5.0: i32);
3838
// _9 = move (_5.1: i32);
39-
// _0 = move _8;
39+
// _0 = _8;
4040
// ...
4141
// return;
4242
// }

‎src/test/mir-opt/lower_128bit_debug_test.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ fn main() {
182182
// ...
183183
// _1 = move (_13.0: i128);
184184
// ...
185-
// _17 = const 7i32 as u128 (Misc);
186-
// _14 = const compiler_builtins::int::shift::rust_i128_shro(_1, move _17) -> bb16;
185+
// _16 = const 7i32 as u128 (Misc);
186+
// _14 = const compiler_builtins::int::shift::rust_i128_shro(_1, move _16) -> bb16;
187187
// ...
188188
// _1 = move (_14.0: i128);
189189
// ...
@@ -195,8 +195,8 @@ fn main() {
195195
// ...
196196
// assert(!move (_13.1: bool), "attempt to shift left with overflow") -> bb8;
197197
// ...
198-
// _16 = const 6i32 as u128 (Misc);
199-
// _13 = const compiler_builtins::int::shift::rust_i128_shlo(_1, move _16) -> bb14;
198+
// _15 = const 6i32 as u128 (Misc);
199+
// _13 = const compiler_builtins::int::shift::rust_i128_shlo(_1, move _15) -> bb14;
200200
// ...
201201
// assert(!move (_14.1: bool), "attempt to shift right with overflow") -> bb9;
202202
// END rustc.test_signed.Lower128Bit.after.mir
@@ -218,8 +218,8 @@ fn main() {
218218
// ...
219219
// _1 = move (_7.0: u128);
220220
// ...
221-
// _11 = const 7i32 as u128 (Misc);
222-
// _8 = const compiler_builtins::int::shift::rust_u128_shro(_1, move _11) -> bb14;
221+
// _10 = const 7i32 as u128 (Misc);
222+
// _8 = const compiler_builtins::int::shift::rust_u128_shro(_1, move _10) -> bb14;
223223
// ...
224224
// _1 = move (_8.0: u128);
225225
// ...
@@ -231,8 +231,8 @@ fn main() {
231231
// ...
232232
// assert(!move (_7.1: bool), "attempt to shift left with overflow") -> bb6;
233233
// ...
234-
// _10 = const 6i32 as u128 (Misc);
235-
// _7 = const compiler_builtins::int::shift::rust_u128_shlo(_1, move _10) -> bb12;
234+
// _9 = const 6i32 as u128 (Misc);
235+
// _7 = const compiler_builtins::int::shift::rust_u128_shlo(_1, move _9) -> bb12;
236236
// ...
237237
// assert(!move (_8.1: bool), "attempt to shift right with overflow") -> bb7;
238238
// END rustc.test_unsigned.Lower128Bit.after.mir

‎src/test/mir-opt/lower_128bit_test.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ fn main() {
176176
// ...
177177
// _1 = const compiler_builtins::int::addsub::rust_i128_sub(_1, const 2i128) -> bb6;
178178
// ...
179-
// _11 = const 7i32 as u32 (Misc);
180-
// _1 = const compiler_builtins::int::shift::rust_i128_shr(_1, move _11) -> bb9;
179+
// _10 = const 7i32 as u32 (Misc);
180+
// _1 = const compiler_builtins::int::shift::rust_i128_shr(_1, move _10) -> bb9;
181181
// ...
182-
// _12 = const 6i32 as u32 (Misc);
183-
// _1 = const compiler_builtins::int::shift::rust_i128_shl(_1, move _12) -> bb10;
182+
// _11 = const 6i32 as u32 (Misc);
183+
// _1 = const compiler_builtins::int::shift::rust_i128_shl(_1, move _11) -> bb10;
184184
// END rustc.test_signed.Lower128Bit.after.mir
185185

186186
// START rustc.test_unsigned.Lower128Bit.after.mir
@@ -194,9 +194,9 @@ fn main() {
194194
// ...
195195
// _1 = const compiler_builtins::int::addsub::rust_u128_sub(_1, const 2u128) -> bb4;
196196
// ...
197-
// _5 = const 7i32 as u32 (Misc);
198-
// _1 = const compiler_builtins::int::shift::rust_u128_shr(_1, move _5) -> bb7;
197+
// _4 = const 7i32 as u32 (Misc);
198+
// _1 = const compiler_builtins::int::shift::rust_u128_shr(_1, move _4) -> bb7;
199199
// ...
200-
// _6 = const 6i32 as u32 (Misc);
201-
// _1 = const compiler_builtins::int::shift::rust_u128_shl(_1, move _6) -> bb8;
200+
// _5 = const 6i32 as u32 (Misc);
201+
// _1 = const compiler_builtins::int::shift::rust_u128_shl(_1, move _5) -> bb8;
202202
// END rustc.test_unsigned.Lower128Bit.after.mir

0 commit comments

Comments
 (0)