Skip to content

Commit bb53ca3

Browse files
m-ou-sem-ou-se
committed
Update tests.
1 parent 25ccdae commit bb53ca3

8 files changed

+122
-106
lines changed

Diff for: ‎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)

Diff for: ‎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
}

Diff for: ‎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
}

Diff for: ‎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
}

Diff for: ‎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
}

Diff for: ‎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

0 commit comments

Comments
 (0)