Skip to content

Commit 83f97a0

Browse files
scottmcmscottmcm
committed
Update checked_ops so 32- and 64-bit gets the same checks
1 parent d4344e6 commit 83f97a0

5 files changed

+174
-19
lines changed

‎tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.mir ‎tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-abort.mir

File renamed without changes.

‎tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// MIR for `checked_shl` after PreCodegen
2+
3+
fn checked_shl(_1: u32, _2: u32) -> Option<u32> {
4+
debug x => _1;
5+
debug rhs => _2;
6+
let mut _0: std::option::Option<u32>;
7+
scope 1 (inlined core::num::<impl u32>::checked_shl) {
8+
debug self => _1;
9+
debug rhs => _2;
10+
let mut _6: bool;
11+
scope 2 {
12+
debug a => _4;
13+
debug b => _5;
14+
}
15+
scope 3 (inlined core::num::<impl u32>::overflowing_shl) {
16+
let mut _4: u32;
17+
let mut _5: bool;
18+
scope 4 (inlined core::num::<impl u32>::wrapping_shl) {
19+
let mut _3: u32;
20+
scope 5 (inlined core::num::<impl u32>::unchecked_shl) {
21+
}
22+
}
23+
}
24+
}
25+
26+
bb0: {
27+
StorageLive(_4);
28+
StorageLive(_5);
29+
StorageLive(_3);
30+
_3 = BitAnd(_2, const 31_u32);
31+
_4 = ShlUnchecked(_1, _3);
32+
StorageDead(_3);
33+
_5 = Ge(_2, const core::num::<impl u32>::BITS);
34+
StorageLive(_6);
35+
_6 = unlikely(move _5) -> [return: bb1, unwind unreachable];
36+
}
37+
38+
bb1: {
39+
switchInt(move _6) -> [0: bb2, otherwise: bb3];
40+
}
41+
42+
bb2: {
43+
_0 = Option::<u32>::Some(_4);
44+
goto -> bb4;
45+
}
46+
47+
bb3: {
48+
_0 = const Option::<u32>::None;
49+
goto -> bb4;
50+
}
51+
52+
bb4: {
53+
StorageDead(_6);
54+
StorageDead(_5);
55+
StorageDead(_4);
56+
return;
57+
}
58+
}
59+
60+
ALLOC0 (size: 8, align: 4) {
61+
00 00 00 00 __ __ __ __ │ ....░░░░
62+
}

‎tests/mir-opt/pre-codegen/checked_ops.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// skip-filecheck
22
//@ compile-flags: -O -Zmir-opt-level=2 -Cdebuginfo=2
3-
//@ needs-unwind
3+
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
44

55
#![crate_type = "lib"]
66
#![feature(step_trait)]
77

88
// EMIT_MIR checked_ops.step_forward.PreCodegen.after.mir
9-
pub fn step_forward(x: u32, n: usize) -> u32 {
9+
pub fn step_forward(x: u16, n: usize) -> u16 {
10+
// This uses `u16` so that the conversion to usize is always widening.
1011
std::iter::Step::forward(x, n)
1112
}
1213

‎tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-abort.mir

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
// MIR for `step_forward` after PreCodegen
2+
3+
fn step_forward(_1: u16, _2: usize) -> u16 {
4+
debug x => _1;
5+
debug n => _2;
6+
let mut _0: u16;
7+
scope 1 (inlined <u16 as Step>::forward) {
8+
debug start => _1;
9+
debug n => _2;
10+
let mut _8: u16;
11+
scope 2 {
12+
}
13+
scope 3 (inlined <u16 as Step>::forward_checked) {
14+
scope 4 {
15+
scope 6 (inlined core::num::<impl u16>::checked_add) {
16+
let mut _7: bool;
17+
scope 7 {
18+
}
19+
scope 8 (inlined core::num::<impl u16>::overflowing_add) {
20+
let mut _5: (u16, bool);
21+
let _6: bool;
22+
scope 9 {
23+
}
24+
}
25+
}
26+
}
27+
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u16>::try_from) {
28+
let mut _3: bool;
29+
let mut _4: u16;
30+
}
31+
}
32+
scope 10 (inlined Option::<u16>::is_none) {
33+
scope 11 (inlined Option::<u16>::is_some) {
34+
}
35+
}
36+
scope 12 (inlined core::num::<impl u16>::wrapping_add) {
37+
}
38+
}
39+
40+
bb0: {
41+
StorageLive(_4);
42+
StorageLive(_3);
43+
_3 = Gt(_2, const 65535_usize);
44+
switchInt(move _3) -> [0: bb1, otherwise: bb5];
45+
}
46+
47+
bb1: {
48+
_4 = _2 as u16 (IntToInt);
49+
StorageDead(_3);
50+
StorageLive(_6);
51+
StorageLive(_5);
52+
_5 = CheckedAdd(_1, _4);
53+
_6 = (_5.1: bool);
54+
StorageDead(_5);
55+
StorageLive(_7);
56+
_7 = unlikely(move _6) -> [return: bb2, unwind unreachable];
57+
}
58+
59+
bb2: {
60+
switchInt(move _7) -> [0: bb3, otherwise: bb4];
61+
}
62+
63+
bb3: {
64+
StorageDead(_7);
65+
StorageDead(_6);
66+
goto -> bb7;
67+
}
68+
69+
bb4: {
70+
StorageDead(_7);
71+
StorageDead(_6);
72+
goto -> bb6;
73+
}
74+
75+
bb5: {
76+
StorageDead(_3);
77+
goto -> bb6;
78+
}
79+
80+
bb6: {
81+
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u16>::MAX, const 1_u16) -> [success: bb7, unwind unreachable];
82+
}
83+
84+
bb7: {
85+
StorageLive(_8);
86+
_8 = _2 as u16 (IntToInt);
87+
_0 = Add(_1, _8);
88+
StorageDead(_8);
89+
StorageDead(_4);
90+
return;
91+
}
92+
}

‎tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.mir ‎tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-unwind.mir

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
// MIR for `step_forward` after PreCodegen
22

3-
fn step_forward(_1: u32, _2: usize) -> u32 {
3+
fn step_forward(_1: u16, _2: usize) -> u16 {
44
debug x => _1;
55
debug n => _2;
6-
let mut _0: u32;
7-
scope 1 (inlined <u32 as Step>::forward) {
6+
let mut _0: u16;
7+
scope 1 (inlined <u16 as Step>::forward) {
88
debug start => _1;
99
debug n => _2;
10-
let mut _8: u32;
10+
let mut _8: u16;
1111
scope 2 {
1212
}
13-
scope 3 (inlined <u32 as Step>::forward_checked) {
13+
scope 3 (inlined <u16 as Step>::forward_checked) {
1414
scope 4 {
15-
scope 6 (inlined core::num::<impl u32>::checked_add) {
15+
scope 6 (inlined core::num::<impl u16>::checked_add) {
1616
let mut _7: bool;
1717
scope 7 {
1818
}
19-
scope 8 (inlined core::num::<impl u32>::overflowing_add) {
20-
let mut _5: (u32, bool);
19+
scope 8 (inlined core::num::<impl u16>::overflowing_add) {
20+
let mut _5: (u16, bool);
2121
let _6: bool;
2222
scope 9 {
2323
}
2424
}
2525
}
2626
}
27-
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u32>::try_from) {
27+
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u16>::try_from) {
2828
let mut _3: bool;
29-
let mut _4: u32;
29+
let mut _4: u16;
3030
}
3131
}
32-
scope 10 (inlined Option::<u32>::is_none) {
33-
scope 11 (inlined Option::<u32>::is_some) {
32+
scope 10 (inlined Option::<u16>::is_none) {
33+
scope 11 (inlined Option::<u16>::is_some) {
3434
}
3535
}
36-
scope 12 (inlined core::num::<impl u32>::wrapping_add) {
36+
scope 12 (inlined core::num::<impl u16>::wrapping_add) {
3737
}
3838
}
3939

4040
bb0: {
4141
StorageLive(_4);
4242
StorageLive(_3);
43-
_3 = Gt(_2, const 4294967295_usize);
43+
_3 = Gt(_2, const 65535_usize);
4444
switchInt(move _3) -> [0: bb1, otherwise: bb5];
4545
}
4646

4747
bb1: {
48-
_4 = _2 as u32 (IntToInt);
48+
_4 = _2 as u16 (IntToInt);
4949
StorageDead(_3);
5050
StorageLive(_6);
5151
StorageLive(_5);
@@ -78,12 +78,12 @@ fn step_forward(_1: u32, _2: usize) -> u32 {
7878
}
7979

8080
bb6: {
81-
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u32>::MAX, const 1_u32) -> [success: bb7, unwind continue];
81+
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u16>::MAX, const 1_u16) -> [success: bb7, unwind continue];
8282
}
8383

8484
bb7: {
8585
StorageLive(_8);
86-
_8 = _2 as u32 (IntToInt);
86+
_8 = _2 as u16 (IntToInt);
8787
_0 = Add(_1, _8);
8888
StorageDead(_8);
8989
StorageDead(_4);

0 commit comments

Comments
 (0)