Skip to content

Commit c9ba288

Browse files
m-ou-sem-ou-se
committed
Bless mir-opt tests.
1 parent f286669 commit c9ba288

File tree

2 files changed

+63
-58
lines changed

2 files changed

+63
-58
lines changed

‎tests/mir-opt/gvn.slices.GVN.panic-abort.diff

+8-4
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@
202202
+ _27 = &(*_12);
203203
_26 = &(*_27);
204204
StorageLive(_28);
205-
_28 = Option::<Arguments<'_>>::None;
205+
- _28 = Option::<Arguments<'_>>::None;
206206
- _22 = assert_failed::<*const u8, *const u8>(move _23, move _24, move _26, move _28) -> unwind unreachable;
207-
+ _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, move _28) -> unwind unreachable;
207+
+ _28 = const Option::<Arguments<'_>>::None;
208+
+ _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, const Option::<Arguments<'_>>::None) -> unwind unreachable;
208209
}
209210

210211
bb7: {
@@ -299,9 +300,12 @@
299300
+ _53 = &(*_38);
300301
_52 = &(*_53);
301302
StorageLive(_54);
302-
_54 = Option::<Arguments<'_>>::None;
303+
- _54 = Option::<Arguments<'_>>::None;
303304
- _48 = assert_failed::<*const u8, *const u8>(move _49, move _50, move _52, move _54) -> unwind unreachable;
304-
+ _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, move _54) -> unwind unreachable;
305+
+ _54 = const Option::<Arguments<'_>>::None;
306+
+ _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, const Option::<Arguments<'_>>::None) -> unwind unreachable;
305307
}
306308
}
309+
+
310+
+ ALLOC0 (size: 16, align: 8) { .. }
307311

‎tests/mir-opt/sroa/lifetimes.foo.ScalarReplacementOfAggregates.diff

+55-54
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,35 @@
1212
let _10: ();
1313
let mut _11: std::fmt::Arguments<'_>;
1414
let mut _12: core::fmt::rt::Template<'_>;
15-
let mut _13: &[core::fmt::rt::Piece; 6];
16-
let _14: &[core::fmt::rt::Piece; 6];
17-
let _15: [core::fmt::rt::Piece; 6];
15+
let mut _13: &[core::fmt::rt::Piece; 7];
16+
let _14: &[core::fmt::rt::Piece; 7];
17+
let _15: [core::fmt::rt::Piece; 7];
1818
let mut _16: core::fmt::rt::Piece;
1919
let mut _17: core::fmt::rt::Piece;
2020
let mut _18: core::fmt::rt::Piece;
2121
let mut _19: core::fmt::rt::Piece;
2222
let mut _20: core::fmt::rt::Piece;
2323
let mut _21: core::fmt::rt::Piece;
24-
let mut _22: &[core::fmt::rt::Argument<'_>; 2];
25-
let _23: &[core::fmt::rt::Argument<'_>; 2];
26-
let _24: [core::fmt::rt::Argument<'_>; 2];
27-
let mut _25: core::fmt::rt::Argument<'_>;
28-
let mut _26: &std::boxed::Box<dyn std::fmt::Display>;
29-
let _27: &std::boxed::Box<dyn std::fmt::Display>;
30-
let mut _28: core::fmt::rt::Argument<'_>;
31-
let mut _29: &u32;
32-
let _30: &u32;
33-
let mut _32: bool;
34-
let mut _33: isize;
24+
let mut _22: core::fmt::rt::Piece;
25+
let mut _23: &[core::fmt::rt::Argument<'_>; 2];
26+
let _24: &[core::fmt::rt::Argument<'_>; 2];
27+
let _25: [core::fmt::rt::Argument<'_>; 2];
28+
let mut _26: core::fmt::rt::Argument<'_>;
29+
let mut _27: &std::boxed::Box<dyn std::fmt::Display>;
30+
let _28: &std::boxed::Box<dyn std::fmt::Display>;
31+
let mut _29: core::fmt::rt::Argument<'_>;
32+
let mut _30: &u32;
33+
let _31: &u32;
34+
let mut _33: bool;
3535
let mut _34: isize;
3636
let mut _35: isize;
37-
+ let _36: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
38-
+ let _37: u32;
37+
let mut _36: isize;
38+
+ let _37: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
39+
+ let _38: u32;
3940
scope 1 {
4041
- debug foo => _1;
41-
+ debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _36;
42-
+ debug ((foo: Foo<T>).1: u32) => _37;
42+
+ debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _37;
43+
+ debug ((foo: Foo<T>).1: u32) => _38;
4344
let _5: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
4445
scope 2 {
4546
debug x => _5;
@@ -49,17 +50,17 @@
4950
scope 4 {
5051
debug x => _8;
5152
let _8: std::boxed::Box<dyn std::fmt::Display>;
52-
let mut _31: &[core::fmt::rt::Piece; 6];
53+
let mut _32: &[core::fmt::rt::Piece; 7];
5354
}
5455
}
5556
}
5657
}
5758

5859
bb0: {
59-
_32 = const false;
60+
_33 = const false;
6061
- StorageLive(_1);
61-
+ StorageLive(_36);
6262
+ StorageLive(_37);
63+
+ StorageLive(_38);
6364
+ nop;
6465
StorageLive(_2);
6566
StorageLive(_3);
@@ -73,82 +74,82 @@
7374
_2 = Result::<Box<dyn std::fmt::Display>, <T as Err>::Err>::Ok(move _3);
7475
StorageDead(_3);
7576
- _1 = Foo::<T> { x: move _2, y: const 7_u32 };
76-
+ _36 = move _2;
77-
+ _37 = const 7_u32;
77+
+ _37 = move _2;
78+
+ _38 = const 7_u32;
7879
+ nop;
7980
StorageDead(_2);
8081
StorageLive(_5);
81-
_32 = const true;
82+
_33 = const true;
8283
- _5 = move (_1.0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>);
83-
+ _5 = move _36;
84+
+ _5 = move _37;
8485
StorageLive(_6);
8586
- _6 = copy (_1.1: u32);
86-
+ _6 = copy _37;
87+
+ _6 = copy _38;
8788
_7 = discriminant(_5);
8889
switchInt(move _7) -> [0: bb2, otherwise: bb8];
8990
}
9091

9192
bb2: {
9293
StorageLive(_8);
93-
_32 = const false;
94+
_33 = const false;
9495
_8 = move ((_5 as Ok).0: std::boxed::Box<dyn std::fmt::Display>);
9596
StorageLive(_9);
9697
StorageLive(_10);
9798
StorageLive(_11);
9899
StorageLive(_12);
99100
StorageLive(_13);
100101
StorageLive(_14);
101-
_31 = const foo::<T>::promoted[0];
102-
_14 = &(*_31);
102+
_32 = const foo::<T>::promoted[0];
103+
_14 = &(*_32);
103104
_13 = &(*_14);
104-
_12 = core::fmt::rt::Template::<'_>::new::<6>(move _13) -> [return: bb3, unwind unreachable];
105+
_12 = core::fmt::rt::Template::<'_>::new::<7>(move _13) -> [return: bb3, unwind unreachable];
105106
}
106107

107108
bb3: {
108109
StorageDead(_13);
109-
StorageLive(_22);
110110
StorageLive(_23);
111111
StorageLive(_24);
112112
StorageLive(_25);
113113
StorageLive(_26);
114114
StorageLive(_27);
115-
_27 = &_8;
116-
_26 = &(*_27);
117-
_25 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _26) -> [return: bb4, unwind unreachable];
115+
StorageLive(_28);
116+
_28 = &_8;
117+
_27 = &(*_28);
118+
_26 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _27) -> [return: bb4, unwind unreachable];
118119
}
119120

120121
bb4: {
121-
StorageDead(_26);
122-
StorageLive(_28);
122+
StorageDead(_27);
123123
StorageLive(_29);
124124
StorageLive(_30);
125-
_30 = &_6;
126-
_29 = &(*_30);
127-
_28 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _29) -> [return: bb5, unwind unreachable];
125+
StorageLive(_31);
126+
_31 = &_6;
127+
_30 = &(*_31);
128+
_29 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _30) -> [return: bb5, unwind unreachable];
128129
}
129130

130131
bb5: {
132+
StorageDead(_30);
133+
_25 = [move _26, move _29];
131134
StorageDead(_29);
132-
_24 = [move _25, move _28];
133-
StorageDead(_28);
134-
StorageDead(_25);
135-
_23 = &_24;
136-
_22 = &(*_23);
137-
_11 = Arguments::<'_>::new::<2>(move _12, move _22) -> [return: bb6, unwind unreachable];
135+
StorageDead(_26);
136+
_24 = &_25;
137+
_23 = &(*_24);
138+
_11 = Arguments::<'_>::new::<2>(move _12, move _23) -> [return: bb6, unwind unreachable];
138139
}
139140

140141
bb6: {
141-
StorageDead(_22);
142+
StorageDead(_23);
142143
StorageDead(_12);
143144
_10 = _eprint(move _11) -> [return: bb7, unwind unreachable];
144145
}
145146

146147
bb7: {
147148
StorageDead(_11);
148-
StorageDead(_30);
149-
StorageDead(_27);
149+
StorageDead(_31);
150+
StorageDead(_28);
151+
StorageDead(_25);
150152
StorageDead(_24);
151-
StorageDead(_23);
152153
StorageDead(_14);
153154
StorageDead(_10);
154155
_9 = const ();
@@ -169,22 +170,22 @@
169170

170171
bb10: {
171172
StorageDead(_6);
172-
_33 = discriminant(_5);
173-
switchInt(move _33) -> [0: bb12, otherwise: bb14];
173+
_34 = discriminant(_5);
174+
switchInt(move _34) -> [0: bb12, otherwise: bb14];
174175
}
175176

176177
bb11: {
177-
_32 = const false;
178+
_33 = const false;
178179
StorageDead(_5);
179180
- StorageDead(_1);
180-
+ StorageDead(_36);
181181
+ StorageDead(_37);
182+
+ StorageDead(_38);
182183
+ nop;
183184
return;
184185
}
185186

186187
bb12: {
187-
switchInt(copy _32) -> [0: bb11, otherwise: bb13];
188+
switchInt(copy _33) -> [0: bb11, otherwise: bb13];
188189
}
189190

190191
bb13: {

0 commit comments

Comments
 (0)