Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d57fa21

Browse files
m-ou-sem-ou-se
committedFeb 20, 2025·
Update tests.
1 parent e610a04 commit d57fa21

9 files changed

+139
-109
lines changed
 

‎tests/coverage/closure.cov-map

+8-12
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,14 @@ Number of file 0 mappings: 3
9696
Highest counter ID seen: c1
9797

9898
Function name: closure::main::{closure#15}
99-
Raw bytes (37): 0x[01, 01, 01, 01, 05, 06, 01, bb, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 01, 11, 01, 1b, 05, 01, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
99+
Raw bytes (27): 0x[01, 01, 01, 01, 05, 04, 01, bb, 01, 09, 03, 1b, 05, 03, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
100100
Number of files: 1
101101
- file 0 => global file 1
102102
Number of expressions: 1
103103
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
104-
Number of file 0 mappings: 6
105-
- Code(Counter(0)) at (prev + 187, 9) to (start + 0, 10)
106-
- Code(Counter(0)) at (prev + 1, 13) to (start + 0, 21)
107-
- Code(Counter(0)) at (prev + 1, 17) to (start + 1, 27)
108-
- Code(Counter(1)) at (prev + 1, 30) to (start + 0, 37)
104+
Number of file 0 mappings: 4
105+
- Code(Counter(0)) at (prev + 187, 9) to (start + 3, 27)
106+
- Code(Counter(1)) at (prev + 3, 30) to (start + 0, 37)
109107
- Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
110108
= (c0 - c1)
111109
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
@@ -125,16 +123,14 @@ Number of file 0 mappings: 3
125123
Highest counter ID seen: c1
126124

127125
Function name: closure::main::{closure#17}
128-
Raw bytes (37): 0x[01, 01, 01, 01, 05, 06, 01, cd, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 01, 11, 01, 1b, 05, 01, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
126+
Raw bytes (27): 0x[01, 01, 01, 01, 05, 04, 01, cd, 01, 09, 03, 1b, 05, 03, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
129127
Number of files: 1
130128
- file 0 => global file 1
131129
Number of expressions: 1
132130
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
133-
Number of file 0 mappings: 6
134-
- Code(Counter(0)) at (prev + 205, 9) to (start + 0, 10)
135-
- Code(Counter(0)) at (prev + 1, 13) to (start + 0, 21)
136-
- Code(Counter(0)) at (prev + 1, 17) to (start + 1, 27)
137-
- Code(Counter(1)) at (prev + 1, 30) to (start + 0, 37)
131+
Number of file 0 mappings: 4
132+
- Code(Counter(0)) at (prev + 205, 9) to (start + 3, 27)
133+
- Code(Counter(1)) at (prev + 3, 30) to (start + 0, 37)
138134
- Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
139135
= (c0 - c1)
140136
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)

‎tests/mir-opt/funky_arms.float_to_exponential_common.GVN.32bit.panic-abort.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
StorageLive(_20);
4848
StorageLive(_21);
4949
_21 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
50-
_20 = BitAnd(move _21, const core::fmt::flags::SIGN_PLUS_FLAG);
50+
_20 = BitAnd(move _21, const core::fmt::rt::SIGN_PLUS_FLAG);
5151
StorageDead(_21);
5252
_4 = Ne(move _20, const 0_u32);
5353
StorageDead(_20);
@@ -72,7 +72,7 @@
7272
StorageLive(_22);
7373
StorageLive(_23);
7474
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
75-
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
75+
_22 = BitAnd(move _23, const core::fmt::rt::PRECISION_FLAG);
7676
StorageDead(_23);
7777
switchInt(move _22) -> [0: bb10, otherwise: bb11];
7878
}

‎tests/mir-opt/funky_arms.float_to_exponential_common.GVN.32bit.panic-unwind.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
StorageLive(_20);
4848
StorageLive(_21);
4949
_21 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
50-
_20 = BitAnd(move _21, const core::fmt::flags::SIGN_PLUS_FLAG);
50+
_20 = BitAnd(move _21, const core::fmt::rt::SIGN_PLUS_FLAG);
5151
StorageDead(_21);
5252
_4 = Ne(move _20, const 0_u32);
5353
StorageDead(_20);
@@ -72,7 +72,7 @@
7272
StorageLive(_22);
7373
StorageLive(_23);
7474
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
75-
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
75+
_22 = BitAnd(move _23, const core::fmt::rt::PRECISION_FLAG);
7676
StorageDead(_23);
7777
switchInt(move _22) -> [0: bb10, otherwise: bb11];
7878
}

‎tests/mir-opt/funky_arms.float_to_exponential_common.GVN.64bit.panic-abort.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
StorageLive(_20);
4848
StorageLive(_21);
4949
_21 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
50-
_20 = BitAnd(move _21, const core::fmt::flags::SIGN_PLUS_FLAG);
50+
_20 = BitAnd(move _21, const core::fmt::rt::SIGN_PLUS_FLAG);
5151
StorageDead(_21);
5252
_4 = Ne(move _20, const 0_u32);
5353
StorageDead(_20);
@@ -72,7 +72,7 @@
7272
StorageLive(_22);
7373
StorageLive(_23);
7474
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
75-
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
75+
_22 = BitAnd(move _23, const core::fmt::rt::PRECISION_FLAG);
7676
StorageDead(_23);
7777
switchInt(move _22) -> [0: bb10, otherwise: bb11];
7878
}

‎tests/mir-opt/funky_arms.float_to_exponential_common.GVN.64bit.panic-unwind.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
StorageLive(_20);
4848
StorageLive(_21);
4949
_21 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
50-
_20 = BitAnd(move _21, const core::fmt::flags::SIGN_PLUS_FLAG);
50+
_20 = BitAnd(move _21, const core::fmt::rt::SIGN_PLUS_FLAG);
5151
StorageDead(_21);
5252
_4 = Ne(move _20, const 0_u32);
5353
StorageDead(_20);
@@ -72,7 +72,7 @@
7272
StorageLive(_22);
7373
StorageLive(_23);
7474
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
75-
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
75+
_22 = BitAnd(move _23, const core::fmt::rt::PRECISION_FLAG);
7676
StorageDead(_23);
7777
switchInt(move _22) -> [0: bb10, otherwise: bb11];
7878
}

‎tests/mir-opt/gvn.slices.GVN.panic-unwind.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 continue;
207-
+ _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, move _28) -> unwind continue;
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 continue;
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 continue;
304-
+ _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, move _54) -> unwind continue;
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 continue;
305307
}
306308
}
309+
+
310+
+ ALLOC0 (size: 16, align: 8) { .. }
307311

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

+93-80
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,35 @@
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];
20-
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;
14+
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];
18+
let mut _16: core::fmt::rt::Piece;
19+
let mut _17: core::fmt::rt::Piece;
20+
let mut _18: core::fmt::rt::Piece;
21+
let mut _19: core::fmt::rt::Piece;
22+
let mut _20: core::fmt::rt::Piece;
23+
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;
35+
let mut _34: isize;
36+
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;
3239
scope 1 {
3340
- 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;
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;
3643
let _5: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
3744
scope 2 {
3845
debug x => _5;
@@ -42,17 +49,17 @@
4249
scope 4 {
4350
debug x => _8;
4451
let _8: std::boxed::Box<dyn std::fmt::Display>;
45-
let mut _24: &[&str; 3];
52+
let mut _31: &[core::fmt::rt::Piece; 6];
4653
}
4754
}
4855
}
4956
}
5057

5158
bb0: {
52-
_25 = const false;
59+
_32 = const false;
5360
- StorageLive(_1);
54-
+ StorageLive(_29);
55-
+ StorageLive(_30);
61+
+ StorageLive(_36);
62+
+ StorageLive(_37);
5663
+ nop;
5764
StorageLive(_2);
5865
StorageLive(_3);
@@ -66,120 +73,126 @@
6673
_2 = Result::<Box<dyn std::fmt::Display>, <T as Err>::Err>::Ok(move _3);
6774
StorageDead(_3);
6875
- _1 = Foo::<T> { x: move _2, y: const 7_u32 };
69-
+ _29 = move _2;
70-
+ _30 = const 7_u32;
76+
+ _36 = move _2;
77+
+ _37 = const 7_u32;
7178
+ nop;
7279
StorageDead(_2);
7380
StorageLive(_5);
74-
_25 = const true;
81+
_32 = const true;
7582
- _5 = move (_1.0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>);
76-
+ _5 = move _29;
83+
+ _5 = move _36;
7784
StorageLive(_6);
7885
- _6 = copy (_1.1: u32);
79-
+ _6 = copy _30;
86+
+ _6 = copy _37;
8087
_7 = discriminant(_5);
81-
switchInt(move _7) -> [0: bb2, otherwise: bb7];
88+
switchInt(move _7) -> [0: bb2, otherwise: bb8];
8289
}
8390

8491
bb2: {
8592
StorageLive(_8);
86-
_25 = const false;
93+
_32 = const false;
8794
_8 = move ((_5 as Ok).0: std::boxed::Box<dyn std::fmt::Display>);
8895
StorageLive(_9);
8996
StorageLive(_10);
9097
StorageLive(_11);
9198
StorageLive(_12);
9299
StorageLive(_13);
93-
_24 = const foo::<T>::promoted[0];
94-
_13 = &(*_24);
95-
_12 = &(*_13);
96-
StorageLive(_15);
97-
StorageLive(_16);
98-
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];
100+
StorageLive(_14);
101+
_31 = const foo::<T>::promoted[0];
102+
_14 = &(*_31);
103+
_13 = &(*_14);
104+
_12 = core::fmt::rt::Template::<'_>::new::<6>(move _13) -> [return: bb3, unwind unreachable];
105105
}
106106

107107
bb3: {
108-
StorageDead(_19);
109-
StorageLive(_21);
108+
StorageDead(_13);
110109
StorageLive(_22);
111110
StorageLive(_23);
112-
_23 = &_6;
113-
_22 = &(*_23);
114-
_21 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _22) -> [return: bb4, unwind unreachable];
111+
StorageLive(_24);
112+
StorageLive(_25);
113+
StorageLive(_26);
114+
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];
115118
}
116119

117120
bb4: {
118-
StorageDead(_22);
119-
_17 = [move _18, move _21];
120-
StorageDead(_21);
121-
StorageDead(_18);
122-
_16 = &_17;
123-
_15 = &(*_16);
124-
_11 = Arguments::<'_>::new_v1::<3, 2>(move _12, move _15) -> [return: bb5, unwind unreachable];
121+
StorageDead(_26);
122+
StorageLive(_28);
123+
StorageLive(_29);
124+
StorageLive(_30);
125+
_30 = &_6;
126+
_29 = &(*_30);
127+
_28 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _29) -> [return: bb5, unwind unreachable];
125128
}
126129

127130
bb5: {
128-
StorageDead(_15);
129-
StorageDead(_12);
130-
_10 = _eprint(move _11) -> [return: bb6, unwind unreachable];
131+
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];
131138
}
132139

133140
bb6: {
141+
StorageDead(_22);
142+
StorageDead(_12);
143+
_10 = _eprint(move _11) -> [return: bb7, unwind unreachable];
144+
}
145+
146+
bb7: {
134147
StorageDead(_11);
148+
StorageDead(_30);
149+
StorageDead(_27);
150+
StorageDead(_24);
135151
StorageDead(_23);
136-
StorageDead(_20);
137-
StorageDead(_17);
138-
StorageDead(_16);
139-
StorageDead(_13);
152+
StorageDead(_14);
140153
StorageDead(_10);
141154
_9 = const ();
142155
StorageDead(_9);
143156
_0 = const ();
144-
drop(_8) -> [return: bb8, unwind unreachable];
157+
drop(_8) -> [return: bb9, unwind unreachable];
145158
}
146159

147-
bb7: {
160+
bb8: {
148161
_0 = const ();
149-
goto -> bb9;
162+
goto -> bb10;
150163
}
151164

152-
bb8: {
165+
bb9: {
153166
StorageDead(_8);
154-
goto -> bb9;
167+
goto -> bb10;
155168
}
156169

157-
bb9: {
170+
bb10: {
158171
StorageDead(_6);
159-
_26 = discriminant(_5);
160-
switchInt(move _26) -> [0: bb11, otherwise: bb13];
172+
_33 = discriminant(_5);
173+
switchInt(move _33) -> [0: bb12, otherwise: bb14];
161174
}
162175

163-
bb10: {
164-
_25 = const false;
176+
bb11: {
177+
_32 = const false;
165178
StorageDead(_5);
166179
- StorageDead(_1);
167-
+ StorageDead(_29);
168-
+ StorageDead(_30);
180+
+ StorageDead(_36);
181+
+ StorageDead(_37);
169182
+ nop;
170183
return;
171184
}
172185

173-
bb11: {
174-
switchInt(copy _25) -> [0: bb10, otherwise: bb12];
175-
}
176-
177186
bb12: {
178-
drop(((_5 as Ok).0: std::boxed::Box<dyn std::fmt::Display>)) -> [return: bb10, unwind unreachable];
187+
switchInt(copy _32) -> [0: bb11, otherwise: bb13];
179188
}
180189

181190
bb13: {
182-
drop(_5) -> [return: bb10, unwind unreachable];
191+
drop(((_5 as Ok).0: std::boxed::Box<dyn std::fmt::Display>)) -> [return: bb11, unwind unreachable];
192+
}
193+
194+
bb14: {
195+
drop(_5) -> [return: bb11, unwind unreachable];
183196
}
184197
}
185198

‎tests/pretty/issue-4264.pp

+17-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,23 @@
3535
((::alloc::fmt::format as
3636
for<'a> fn(Arguments<'a>) -> String {format})(((format_arguments::new_const
3737
as
38-
fn(&[&'static str; 1]) -> Arguments<'_> {Arguments::<'_>::new_const::<1>})((&([("test"
39-
as &str)] as [&str; 1]) as &[&str; 1])) as Arguments<'_>))
40-
as String);
38+
fn(core::fmt::rt::Template<'_>) -> Arguments<'_> {Arguments::<'_>::new_const})((unsafe
39+
{
40+
((format_template::new as
41+
unsafe fn(&[core::fmt::rt::Piece; 3]) -> core::fmt::rt::Template<'_> {core::fmt::rt::Template::<'_>::new::<3>})((&([((format_piece::num
42+
as
43+
fn(u64) -> core::fmt::rt::Piece {core::fmt::rt::Piece::num})((4u64
44+
as u64)) as core::fmt::rt::Piece),
45+
((format_piece::str as
46+
fn(&'static str) -> core::fmt::rt::Piece {core::fmt::rt::Piece::str})(("test"
47+
as &str)) as core::fmt::rt::Piece),
48+
((format_piece::num as
49+
fn(u64) -> core::fmt::rt::Piece {core::fmt::rt::Piece::num})((0u64
50+
as u64)) as core::fmt::rt::Piece)] as
51+
[core::fmt::rt::Piece; 3]) as &[core::fmt::rt::Piece; 3]))
52+
as core::fmt::rt::Template<'_>)
53+
} as core::fmt::rt::Template<'_>)) as Arguments<'_>)) as
54+
String);
4155
(res as String)
4256
} as String)) as String);
4357
} as ())

‎tests/ui/unpretty/flattened-format-args.stdout

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ fn main() {
99
let x = 1;
1010
// Should flatten to println!("a 123 b {x} xyz\n"):
1111
{
12-
::std::io::_print(format_arguments::new_v1(&["a 123 b ", " xyz\n"],
13-
&[format_argument::new_display(&x)]));
12+
::std::io::_print(format_arguments::new(unsafe {
13+
format_template::new(&[format_piece::num(8u64),
14+
format_piece::str("a 123 b "), format_piece::num(5u64),
15+
format_piece::str(" xyz\n"), format_piece::num(0u64)])
16+
}, &[format_argument::new_display(&x)]));
1417
};
1518
}

0 commit comments

Comments
 (0)
Please sign in to comment.