user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix integer overflow

Browse source
This commit is contained in:
varkor 2018-05-22 01:02:47 +01:00
parent 7695bd0be9
commit a553fa7244
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_mir/hair/pattern/_match.rs
View file

@ -475,8 +475,8 @@ fn all_constructors<'a, 'tcx: 'a>(cx: &mut MatchCheckCtxt<'a, 'tcx>,
let min_max_ty = |sty| {
let size = cx.tcx.layout_of(ty::ParamEnv::reveal_all().and(sty))
.unwrap().size.bits() as i128;
let min = -(1 << (size - 1));
let max = (1 << (size - 1)) - 1;
let min = (1i128 << (size - 1)).wrapping_neg();
let max = (1i128 << (size - 1)).wrapping_sub(1);
(min as u128, max as u128, sty)
};
let (min, max, ty) = match int_ty {
@ -496,8 +496,9 @@ fn all_constructors<'a, 'tcx: 'a>(cx: &mut MatchCheckCtxt<'a, 'tcx>,
use syntax::ast::UintTy::*;
let min_max_ty = |sty| {
let size = cx.tcx.layout_of(ty::ParamEnv::reveal_all().and(sty))
.unwrap().size.bits() as i128;
let max = (1 << size) - 1;
.unwrap().size.bits() as u32;
let shift = 1u128.overflowing_shl(size);
let max = shift.0.wrapping_sub(1 + (shift.1 as u128));
(0u128, max as u128, sty)
};
let (min, max, ty) = match uint_ty {