dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update `checked_ops` so 32- and 64-bit gets the same checks

This commit is contained in:
Scott McMurray 2024-04-16 11:11:30 -07:00
parent d05545c05d
commit 6094063c35
5 changed files with 174 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
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
View File

62
tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir Normal file
View File

@ -0,0 +1,62 @@
// MIR for `checked_shl` after PreCodegen
fn checked_shl(_1: u32, _2: u32) -> Option<u32> {
debug x => _1;
debug rhs => _2;
let mut _0: std::option::Option<u32>;
scope 1 (inlined core::num::<impl u32>::checked_shl) {
debug self => _1;
debug rhs => _2;
let mut _6: bool;
scope 2 {
debug a => _4;
debug b => _5;
}
scope 3 (inlined core::num::<impl u32>::overflowing_shl) {
let mut _4: u32;
let mut _5: bool;
scope 4 (inlined core::num::<impl u32>::wrapping_shl) {
let mut _3: u32;
scope 5 (inlined core::num::<impl u32>::unchecked_shl) {
}
}
}
}
bb0: {
StorageLive(_4);
StorageLive(_5);
StorageLive(_3);
_3 = BitAnd(_2, const 31_u32);
_4 = ShlUnchecked(_1, _3);
StorageDead(_3);
_5 = Ge(_2, const core::num::<impl u32>::BITS);
StorageLive(_6);
_6 = unlikely(move _5) -> [return: bb1, unwind unreachable];
}
bb1: {
switchInt(move _6) -> [0: bb2, otherwise: bb3];
}
bb2: {
_0 = Option::<u32>::Some(_4);
goto -> bb4;
}
bb3: {
_0 = const Option::<u32>::None;
goto -> bb4;
}
bb4: {
StorageDead(_6);
StorageDead(_5);
StorageDead(_4);
return;
}
}
ALLOC0 (size: 8, align: 4) {
00 00 00 00 __ __ __ __ │ ....░░░░
}

5
tests/mir-opt/pre-codegen/checked_ops.rs
View File

@ -1,12 +1,13 @@
// skip-filecheck
//@ compile-flags: -O -Zmir-opt-level=2 -Cdebuginfo=2
//@ needs-unwind
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
#![crate_type = "lib"]
#![feature(step_trait)]
// EMIT_MIR checked_ops.step_forward.PreCodegen.after.mir
pub fn step_forward(x: u32, n: usize) -> u32 {
pub fn step_forward(x: u16, n: usize) -> u16 {
// This uses `u16` so that the conversion to usize is always widening.
std::iter::Step::forward(x, n)
}

92
tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-abort.mir Normal file
View File

@ -0,0 +1,92 @@
// MIR for `step_forward` after PreCodegen
fn step_forward(_1: u16, _2: usize) -> u16 {
debug x => _1;
debug n => _2;
let mut _0: u16;
scope 1 (inlined <u16 as Step>::forward) {
debug start => _1;
debug n => _2;
let mut _8: u16;
scope 2 {
}
scope 3 (inlined <u16 as Step>::forward_checked) {
scope 4 {
scope 6 (inlined core::num::<impl u16>::checked_add) {
let mut _7: bool;
scope 7 {
}
scope 8 (inlined core::num::<impl u16>::overflowing_add) {
let mut _5: (u16, bool);
let _6: bool;
scope 9 {
}
}
}
}
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u16>::try_from) {
let mut _3: bool;
let mut _4: u16;
}
}
scope 10 (inlined Option::<u16>::is_none) {
scope 11 (inlined Option::<u16>::is_some) {
}
}
scope 12 (inlined core::num::<impl u16>::wrapping_add) {
}
}
bb0: {
StorageLive(_4);
StorageLive(_3);
_3 = Gt(_2, const 65535_usize);
switchInt(move _3) -> [0: bb1, otherwise: bb5];
}
bb1: {
_4 = _2 as u16 (IntToInt);
StorageDead(_3);
StorageLive(_6);
StorageLive(_5);
_5 = CheckedAdd(_1, _4);
_6 = (_5.1: bool);
StorageDead(_5);
StorageLive(_7);
_7 = unlikely(move _6) -> [return: bb2, unwind unreachable];
}
bb2: {
switchInt(move _7) -> [0: bb3, otherwise: bb4];
}
bb3: {
StorageDead(_7);
StorageDead(_6);
goto -> bb7;
}
bb4: {
StorageDead(_7);
StorageDead(_6);
goto -> bb6;
}
bb5: {
StorageDead(_3);
goto -> bb6;
}
bb6: {
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u16>::MAX, const 1_u16) -> [success: bb7, unwind unreachable];
}
bb7: {
StorageLive(_8);
_8 = _2 as u16 (IntToInt);
_0 = Add(_1, _8);
StorageDead(_8);
StorageDead(_4);
return;
}
}

34
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
View File

@ -1,51 +1,51 @@
// MIR for `step_forward` after PreCodegen
fn step_forward(_1: u32, _2: usize) -> u32 {
fn step_forward(_1: u16, _2: usize) -> u16 {
debug x => _1;
debug n => _2;
let mut _0: u32;
scope 1 (inlined <u32 as Step>::forward) {
let mut _0: u16;
scope 1 (inlined <u16 as Step>::forward) {
debug start => _1;
debug n => _2;
let mut _8: u32;
let mut _8: u16;
scope 2 {
}
scope 3 (inlined <u32 as Step>::forward_checked) {
scope 3 (inlined <u16 as Step>::forward_checked) {
scope 4 {
scope 6 (inlined core::num::<impl u32>::checked_add) {
scope 6 (inlined core::num::<impl u16>::checked_add) {
let mut _7: bool;
scope 7 {
}
scope 8 (inlined core::num::<impl u32>::overflowing_add) {
let mut _5: (u32, bool);
scope 8 (inlined core::num::<impl u16>::overflowing_add) {
let mut _5: (u16, bool);
let _6: bool;
scope 9 {
}
}
}
}
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u32>::try_from) {
scope 5 (inlined convert::num::ptr_try_from_impls::<impl TryFrom<usize> for u16>::try_from) {
let mut _3: bool;
let mut _4: u32;
let mut _4: u16;
}
}
scope 10 (inlined Option::<u32>::is_none) {
scope 11 (inlined Option::<u32>::is_some) {
scope 10 (inlined Option::<u16>::is_none) {
scope 11 (inlined Option::<u16>::is_some) {
}
}
scope 12 (inlined core::num::<impl u32>::wrapping_add) {
scope 12 (inlined core::num::<impl u16>::wrapping_add) {
}
}
bb0: {
StorageLive(_4);
StorageLive(_3);
_3 = Gt(_2, const 4294967295_usize);
_3 = Gt(_2, const 65535_usize);
switchInt(move _3) -> [0: bb1, otherwise: bb5];
}
bb1: {
_4 = _2 as u32 (IntToInt);
_4 = _2 as u16 (IntToInt);
StorageDead(_3);
StorageLive(_6);
StorageLive(_5);
@ -78,12 +78,12 @@ fn step_forward(_1: u32, _2: usize) -> u32 {
}
bb6: {
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u32>::MAX, const 1_u32) -> [success: bb7, unwind continue];
assert(!const true, "attempt to compute `{} + {}`, which would overflow", const core::num::<impl u16>::MAX, const 1_u16) -> [success: bb7, unwind continue];
}
bb7: {
StorageLive(_8);
_8 = _2 as u32 (IntToInt);
_8 = _2 as u16 (IntToInt);
_0 = Add(_1, _8);
StorageDead(_8);
StorageDead(_4);