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

Avoid u/i*::{min.max}_value()

Browse source 
They will be deprecated in the future
This commit is contained in:
bjorn3 2020-03-20 16:29:05 +01:00
parent a59479bd37
commit e9db3e7817
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/codegen_i128.rs
View file

@ -108,7 +108,7 @@ pub fn maybe_codegen<'tcx>(
}
(BinOp::Shr, true) => {
let sign = fx.bcx.ins().icmp_imm(IntCC::SignedLessThan, lhs_msb, 0);
let all_ones = fx.bcx.ins().iconst(types::I64, u64::max_value() as i64);
let all_ones = fx.bcx.ins().iconst(types::I64, u64::MAX as i64);
let all_sign_bits = fx.bcx.ins().select(sign, all_zeros, all_ones);
let val = fx.bcx.ins().iconcat(lhs_msb, all_sign_bits);

24
src/common.rs
View file

@ -221,23 +221,23 @@ pub fn type_min_max_value(ty: Type, signed: bool) -> (i64, i64) {
(types::I8, false) | (types::I16, false) | (types::I32, false) | (types::I64, false) => {
0i64
}
(types::I8, true) => i8::min_value() as i64,
(types::I16, true) => i16::min_value() as i64,
(types::I32, true) => i32::min_value() as i64,
(types::I64, true) => i64::min_value(),
(types::I8, true) => i8::MIN as i64,
(types::I16, true) => i16::MIN as i64,
(types::I32, true) => i32::MIN as i64,
(types::I64, true) => i64::MIN,
(types::I128, _) => unimplemented!(),
_ => unreachable!(),
};
let max = match (ty, signed) {
(types::I8, false) => u8::max_value() as i64,
(types::I16, false) => u16::max_value() as i64,
(types::I32, false) => u32::max_value() as i64,
(types::I64, false) => u64::max_value() as i64,
(types::I8, true) => i8::max_value() as i64,
(types::I16, true) => i16::max_value() as i64,
(types::I32, true) => i32::max_value() as i64,
(types::I64, true) => i64::max_value(),
(types::I8, false) => u8::MAX as i64,
(types::I16, false) => u16::MAX as i64,
(types::I32, false) => u32::MAX as i64,
(types::I64, false) => u64::MAX as i64,
(types::I8, true) => i8::MAX as i64,
(types::I16, true) => i16::MAX as i64,
(types::I32, true) => i32::MAX as i64,
(types::I64, true) => i64::MAX,
(types::I128, _) => unimplemented!(),
_ => unreachable!(),
};

2
src/discriminant.rs
View file

@ -119,7 +119,7 @@ pub fn codegen_get_discriminant<'tcx>(
let relative_discr = if niche_start == 0 {
encoded_discr
} else {
// FIXME handle niche_start > i64::max_value()
// FIXME handle niche_start > i64::MAX
fx.bcx
.ins()
.iadd_imm(encoded_discr, -i64::try_from(niche_start).unwrap())

2
src/intrinsics/mod.rs
View file

@ -227,7 +227,7 @@ fn bool_to_zero_or_max_uint<'tcx>(
let max = fx
.bcx
.ins()
.iconst(int_ty, (u64::max_value() >> (64 - int_ty.bits())) as i64);
.iconst(int_ty, (u64::MAX >> (64 - int_ty.bits())) as i64);
let mut res = fx.bcx.ins().select(val, max, zero);
if ty.is_float() {