Skip to content

Commit 295a1af

Browse files
m-ou-sem-ou-se
committed
Update mir-opt tests.
1 parent b532f1b commit 295a1af

File tree

1 file changed

+94
-65
lines changed

1 file changed

+94
-65
lines changed

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

+94-65
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,29 @@
1111
let _9: ();
1212
let _10: ();
1313
let mut _11: std::fmt::Arguments<'_>;
14-
let mut _12: &[&str; 3];
15-
let _13: &[&str; 3];
16-
let _14: [&str; 3];
17-
let mut _15: &[core::fmt::rt::Argument<'_>; 2];
18-
let _16: &[core::fmt::rt::Argument<'_>; 2];
19-
let _17: [core::fmt::rt::Argument<'_>; 2];
14+
let mut _13: &std::boxed::Box<dyn std::fmt::Display>;
15+
let mut _14: &u32;
16+
let mut _16: core::fmt::rt::Argument<'_>;
17+
let mut _17: &std::boxed::Box<dyn std::fmt::Display>;
2018
let mut _18: core::fmt::rt::Argument<'_>;
21-
let mut _19: &std::boxed::Box<dyn std::fmt::Display>;
22-
let _20: &std::boxed::Box<dyn std::fmt::Display>;
23-
let mut _21: core::fmt::rt::Argument<'_>;
24-
let mut _22: &u32;
25-
let _23: &u32;
26-
let mut _25: bool;
27-
let mut _26: isize;
28-
let mut _27: isize;
29-
let mut _28: isize;
30-
+ let _29: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
31-
+ let _30: u32;
19+
let mut _19: &u32;
20+
let mut _20: &[&str; 3];
21+
let _21: &[&str; 3];
22+
let _22: [&str; 3];
23+
let mut _23: &[core::fmt::rt::Argument<'_>; 2];
24+
let _24: &[core::fmt::rt::Argument<'_>; 2];
25+
let mut _26: &std::boxed::Box<dyn std::fmt::Display>;
26+
let mut _27: &u32;
27+
let mut _28: bool;
28+
let mut _29: isize;
29+
let mut _30: isize;
30+
let mut _31: isize;
31+
+ let _32: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
32+
+ let _33: u32;
3233
scope 1 {
3334
- debug foo => _1;
34-
+ debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _29;
35-
+ debug ((foo: Foo<T>).1: u32) => _30;
35+
+ debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _32;
36+
+ debug ((foo: Foo<T>).1: u32) => _33;
3637
let _5: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
3738
scope 2 {
3839
debug x => _5;
@@ -42,17 +43,29 @@
4243
scope 4 {
4344
debug x => _8;
4445
let _8: std::boxed::Box<dyn std::fmt::Display>;
45-
let mut _24: &[&str; 3];
46+
let _12: (&std::boxed::Box<dyn std::fmt::Display>, &u32);
47+
+ let _34: &std::boxed::Box<dyn std::fmt::Display>;
48+
+ let _35: &u32;
49+
scope 5 {
50+
- debug args => _12;
51+
+ debug ((args: (&Box<dyn std::fmt::Display>, &u32)).0: &std::boxed::Box<dyn std::fmt::Display>) => _34;
52+
+ debug ((args: (&Box<dyn std::fmt::Display>, &u32)).1: &u32) => _35;
53+
let _15: [core::fmt::rt::Argument<'_>; 2];
54+
scope 6 {
55+
debug args => _15;
56+
let mut _25: &[&str; 3];
57+
}
58+
}
4659
}
4760
}
4861
}
4962
}
5063

5164
bb0: {
52-
_25 = const false;
65+
_28 = const false;
5366
- StorageLive(_1);
54-
+ StorageLive(_29);
55-
+ StorageLive(_30);
67+
+ StorageLive(_32);
68+
+ StorageLive(_33);
5669
+ nop;
5770
StorageLive(_2);
5871
StorageLive(_3);
@@ -66,77 +79,93 @@
6679
_2 = Result::<Box<dyn std::fmt::Display>, <T as Err>::Err>::Ok(move _3);
6780
StorageDead(_3);
6881
- _1 = Foo::<T> { x: move _2, y: const 7_u32 };
69-
+ _29 = move _2;
70-
+ _30 = const 7_u32;
82+
+ _32 = move _2;
83+
+ _33 = const 7_u32;
7184
+ nop;
7285
StorageDead(_2);
7386
StorageLive(_5);
74-
_25 = const true;
87+
_28 = const true;
7588
- _5 = move (_1.0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>);
76-
+ _5 = move _29;
89+
+ _5 = move _32;
7790
StorageLive(_6);
7891
- _6 = copy (_1.1: u32);
79-
+ _6 = copy _30;
92+
+ _6 = copy _33;
8093
_7 = discriminant(_5);
8194
switchInt(move _7) -> [0: bb2, otherwise: bb7];
8295
}
8396

8497
bb2: {
8598
StorageLive(_8);
86-
_25 = const false;
99+
_28 = const false;
87100
_8 = move ((_5 as Ok).0: std::boxed::Box<dyn std::fmt::Display>);
88101
StorageLive(_9);
89102
StorageLive(_10);
90103
StorageLive(_11);
91-
StorageLive(_12);
104+
- StorageLive(_12);
105+
+ StorageLive(_34);
106+
+ StorageLive(_35);
107+
+ nop;
92108
StorageLive(_13);
93-
_24 = const foo::<T>::promoted[0];
94-
_13 = &(*_24);
95-
_12 = &(*_13);
109+
_13 = &_8;
110+
StorageLive(_14);
111+
_14 = &_6;
112+
- _12 = (move _13, move _14);
113+
+ _34 = move _13;
114+
+ _35 = move _14;
115+
+ nop;
116+
StorageDead(_14);
117+
StorageDead(_13);
96118
StorageLive(_15);
97119
StorageLive(_16);
98120
StorageLive(_17);
99-
StorageLive(_18);
100-
StorageLive(_19);
101-
StorageLive(_20);
102-
_20 = &_8;
103-
_19 = &(*_20);
104-
_18 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _19) -> [return: bb3, unwind unreachable];
121+
- _26 = deref_copy (_12.0: &std::boxed::Box<dyn std::fmt::Display>);
122+
+ _26 = deref_copy _34;
123+
_17 = &(*_26);
124+
_16 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _17) -> [return: bb3, unwind unreachable];
105125
}
106126

107127
bb3: {
108-
StorageDead(_19);
109-
StorageLive(_21);
110-
StorageLive(_22);
111-
StorageLive(_23);
112-
_23 = &_6;
113-
_22 = &(*_23);
114-
_21 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _22) -> [return: bb4, unwind unreachable];
128+
StorageDead(_17);
129+
StorageLive(_18);
130+
StorageLive(_19);
131+
- _27 = deref_copy (_12.1: &u32);
132+
+ _27 = deref_copy _35;
133+
_19 = &(*_27);
134+
_18 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _19) -> [return: bb4, unwind unreachable];
115135
}
116136

117137
bb4: {
118-
StorageDead(_22);
119-
_17 = [move _18, move _21];
120-
StorageDead(_21);
138+
StorageDead(_19);
139+
_15 = [move _16, move _18];
121140
StorageDead(_18);
122-
_16 = &_17;
123-
_15 = &(*_16);
124-
_11 = core::fmt::rt::<impl Arguments<'_>>::new_v1::<3, 2>(move _12, move _15) -> [return: bb5, unwind unreachable];
141+
StorageDead(_16);
142+
StorageLive(_20);
143+
StorageLive(_21);
144+
_25 = const foo::<T>::promoted[0];
145+
_21 = &(*_25);
146+
_20 = &(*_21);
147+
StorageLive(_23);
148+
StorageLive(_24);
149+
_24 = &_15;
150+
_23 = &(*_24);
151+
_11 = core::fmt::rt::<impl Arguments<'_>>::new_v1::<3, 2>(move _20, move _23) -> [return: bb5, unwind unreachable];
125152
}
126153

127154
bb5: {
128-
StorageDead(_15);
129-
StorageDead(_12);
155+
StorageDead(_24);
156+
StorageDead(_23);
157+
StorageDead(_21);
158+
StorageDead(_20);
130159
_10 = _eprint(move _11) -> [return: bb6, unwind unreachable];
131160
}
132161

133162
bb6: {
134163
StorageDead(_11);
135-
StorageDead(_23);
136-
StorageDead(_20);
137-
StorageDead(_17);
138-
StorageDead(_16);
139-
StorageDead(_13);
164+
StorageDead(_15);
165+
- StorageDead(_12);
166+
+ StorageDead(_34);
167+
+ StorageDead(_35);
168+
+ nop;
140169
StorageDead(_10);
141170
_9 = const ();
142171
StorageDead(_9);
@@ -156,22 +185,22 @@
156185

157186
bb9: {
158187
StorageDead(_6);
159-
_26 = discriminant(_5);
160-
switchInt(move _26) -> [0: bb11, otherwise: bb13];
188+
_29 = discriminant(_5);
189+
switchInt(move _29) -> [0: bb11, otherwise: bb13];
161190
}
162191

163192
bb10: {
164-
_25 = const false;
193+
_28 = const false;
165194
StorageDead(_5);
166195
- StorageDead(_1);
167-
+ StorageDead(_29);
168-
+ StorageDead(_30);
196+
+ StorageDead(_32);
197+
+ StorageDead(_33);
169198
+ nop;
170199
return;
171200
}
172201

173202
bb11: {
174-
switchInt(copy _25) -> [0: bb10, otherwise: bb12];
203+
switchInt(copy _28) -> [0: bb10, otherwise: bb12];
175204
}
176205

177206
bb12: {

0 commit comments

Comments
 (0)