mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #124113 - RalfJung:interpret-scalar-ops, r=oli-obk

Browse Source 
interpret: use ScalarInt for bin-ops; avoid PartialOrd for ScalarInt

Best reviewed commit-by-commit

r? `@oli-obk`
This commit is contained in:
bors 2024-04-19 17:00:28 +00:00
commit a2a949b031
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/constant.rs
View File

@ -110,7 +110,7 @@ pub(crate) fn codegen_const_value<'tcx>(
if fx.clif_type(layout.ty).is_some() { if fx.clif_type(layout.ty).is_some() {
return CValue::const_val(fx, layout, int); return CValue::const_val(fx, layout, int);
} else { } else {
let raw_val = int.size().truncate(int.to_bits(int.size()).unwrap()); let raw_val = int.size().truncate(int.assert_bits(int.size()));
let val = match int.size().bytes() { let val = match int.size().bytes() {
1 => fx.bcx.ins().iconst(types::I8, raw_val as i64), 1 => fx.bcx.ins().iconst(types::I8, raw_val as i64),
2 => fx.bcx.ins().iconst(types::I16, raw_val as i64), 2 => fx.bcx.ins().iconst(types::I16, raw_val as i64),
@ -491,27 +491,24 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
return None; return None;
} }
let scalar_int = mir_operand_get_const_val(fx, operand)?; let scalar_int = mir_operand_get_const_val(fx, operand)?;
let scalar_int = match fx let scalar_int =
.layout_of(*ty) match fx.layout_of(*ty).size.cmp(&scalar_int.size()) {
.size Ordering::Equal => scalar_int,
.cmp(&scalar_int.size()) Ordering::Less => match ty.kind() {
{ ty::Uint(_) => ScalarInt::try_from_uint(
Ordering::Equal => scalar_int, scalar_int.assert_uint(scalar_int.size()),
Ordering::Less => match ty.kind() { fx.layout_of(*ty).size,
ty::Uint(_) => ScalarInt::try_from_uint( )
scalar_int.try_to_uint(scalar_int.size()).unwrap(), .unwrap(),
fx.layout_of(*ty).size, ty::Int(_) => ScalarInt::try_from_int(
) scalar_int.assert_int(scalar_int.size()),
.unwrap(), fx.layout_of(*ty).size,
ty::Int(_) => ScalarInt::try_from_int( )
scalar_int.try_to_int(scalar_int.size()).unwrap(), .unwrap(),
fx.layout_of(*ty).size, _ => unreachable!(),
) },
.unwrap(), Ordering::Greater => return None,
_ => unreachable!(), };
},
Ordering::Greater => return None,
};
computed_scalar_int = Some(scalar_int); computed_scalar_int = Some(scalar_int);
} }
Rvalue::Use(operand) => { Rvalue::Use(operand) => {

4
src/value_and_place.rs
View File

@ -326,7 +326,7 @@ impl<'tcx> CValue<'tcx> {
let val = match layout.ty.kind() { let val = match layout.ty.kind() {
ty::Uint(UintTy::U128) | ty::Int(IntTy::I128) => { ty::Uint(UintTy::U128) | ty::Int(IntTy::I128) => {
let const_val = const_val.to_bits(layout.size).unwrap(); let const_val = const_val.assert_bits(layout.size);
let lsb = fx.bcx.ins().iconst(types::I64, const_val as u64 as i64); let lsb = fx.bcx.ins().iconst(types::I64, const_val as u64 as i64);
let msb = fx.bcx.ins().iconst(types::I64, (const_val >> 64) as u64 as i64); let msb = fx.bcx.ins().iconst(types::I64, (const_val >> 64) as u64 as i64);
fx.bcx.ins().iconcat(lsb, msb) fx.bcx.ins().iconcat(lsb, msb)
@ -338,7 +338,7 @@ impl<'tcx> CValue<'tcx> {
| ty::Ref(..) | ty::Ref(..)
| ty::RawPtr(..) | ty::RawPtr(..)
| ty::FnPtr(..) => { | ty::FnPtr(..) => {
let raw_val = const_val.size().truncate(const_val.to_bits(layout.size).unwrap()); let raw_val = const_val.size().truncate(const_val.assert_bits(layout.size));
fx.bcx.ins().iconst(clif_ty, raw_val as i64) fx.bcx.ins().iconst(clif_ty, raw_val as i64)
} }
ty::Float(FloatTy::F32) => { ty::Float(FloatTy::F32) => {