Skip to content

Commit ef82648

Browse files
committed
bless sroa mir-opt test again
1 parent 767b5e0 commit ef82648

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

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

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
let _24: &[core::fmt::rt::Argument<'_>; 2];
2525
let mut _26: &std::boxed::Box<dyn std::fmt::Display>;
2626
let mut _27: &u32;
27-
let mut _28: isize;
27+
let mut _28: bool;
2828
let mut _29: isize;
2929
let mut _30: isize;
30-
+ let _31: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
31-
+ let _32: u32;
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>) => _31;
35-
+ debug ((foo: Foo<T>).1: u32) => _32;
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;
@@ -43,12 +44,12 @@
4344
debug x => _8;
4445
let _8: std::boxed::Box<dyn std::fmt::Display>;
4546
let _12: (&std::boxed::Box<dyn std::fmt::Display>, &u32);
46-
+ let _33: &std::boxed::Box<dyn std::fmt::Display>;
47-
+ let _34: &u32;
47+
+ let _34: &std::boxed::Box<dyn std::fmt::Display>;
48+
+ let _35: &u32;
4849
scope 5 {
4950
- debug args => _12;
50-
+ debug ((args: (&Box<dyn std::fmt::Display>, &u32)).0: &std::boxed::Box<dyn std::fmt::Display>) => _33;
51-
+ debug ((args: (&Box<dyn std::fmt::Display>, &u32)).1: &u32) => _34;
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;
5253
let _15: [core::fmt::rt::Argument<'_>; 2];
5354
scope 6 {
5455
debug args => _15;
@@ -61,9 +62,10 @@
6162
}
6263

6364
bb0: {
65+
_28 = const false;
6466
- StorageLive(_1);
65-
+ StorageLive(_31);
6667
+ StorageLive(_32);
68+
+ StorageLive(_33);
6769
+ nop;
6870
StorageLive(_2);
6971
StorageLive(_3);
@@ -77,16 +79,17 @@
7779
_2 = Result::<Box<dyn std::fmt::Display>, <T as Err>::Err>::Ok(move _3);
7880
StorageDead(_3);
7981
- _1 = Foo::<T> { x: move _2, y: const 7_u32 };
80-
+ _31 = move _2;
81-
+ _32 = const 7_u32;
82+
+ _32 = move _2;
83+
+ _33 = const 7_u32;
8284
+ nop;
8385
StorageDead(_2);
8486
StorageLive(_5);
87+
_28 = const true;
8588
- _5 = move (_1.0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>);
86-
+ _5 = move _31;
89+
+ _5 = move _32;
8790
StorageLive(_6);
8891
- _6 = copy (_1.1: u32);
89-
+ _6 = copy _32;
92+
+ _6 = copy _33;
9093
_7 = discriminant(_5);
9194
switchInt(move _7) -> [0: bb2, otherwise: bb7];
9295
}
@@ -98,24 +101,24 @@
98101
StorageLive(_10);
99102
StorageLive(_11);
100103
- StorageLive(_12);
101-
+ StorageLive(_33);
102104
+ StorageLive(_34);
105+
+ StorageLive(_35);
103106
+ nop;
104107
StorageLive(_13);
105108
_13 = &_8;
106109
StorageLive(_14);
107110
_14 = &_6;
108111
- _12 = (move _13, move _14);
109-
+ _33 = move _13;
110-
+ _34 = move _14;
112+
+ _34 = move _13;
113+
+ _35 = move _14;
111114
+ nop;
112115
StorageDead(_14);
113116
StorageDead(_13);
114117
StorageLive(_15);
115118
StorageLive(_16);
116119
StorageLive(_17);
117120
- _26 = deref_copy (_12.0: &std::boxed::Box<dyn std::fmt::Display>);
118-
+ _26 = deref_copy _33;
121+
+ _26 = deref_copy _34;
119122
_17 = &(*_26);
120123
_16 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _17) -> [return: bb3, unwind unreachable];
121124
}
@@ -125,7 +128,7 @@
125128
StorageLive(_18);
126129
StorageLive(_19);
127130
- _27 = deref_copy (_12.1: &u32);
128-
+ _27 = deref_copy _34;
131+
+ _27 = deref_copy _35;
129132
_19 = &(*_27);
130133
_18 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _19) -> [return: bb4, unwind unreachable];
131134
}
@@ -159,8 +162,8 @@
159162
StorageDead(_11);
160163
StorageDead(_15);
161164
- StorageDead(_12);
162-
+ StorageDead(_33);
163165
+ StorageDead(_34);
166+
+ StorageDead(_35);
164167
+ nop;
165168
StorageDead(_10);
166169
_9 = const ();
@@ -181,15 +184,16 @@
181184

182185
bb9: {
183186
StorageDead(_6);
184-
_28 = discriminant(_5);
185-
switchInt(move _28) -> [0: bb10, otherwise: bb11];
187+
_29 = discriminant(_5);
188+
switchInt(move _29) -> [0: bb10, otherwise: bb11];
186189
}
187190

188191
bb10: {
192+
_28 = const false;
189193
StorageDead(_5);
190194
- StorageDead(_1);
191-
+ StorageDead(_31);
192195
+ StorageDead(_32);
196+
+ StorageDead(_33);
193197
+ nop;
194198
return;
195199
}

0 commit comments

Comments
 (0)