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

Simplify finiteness checking

Browse Source
This commit is contained in:
Smitty 2021-05-03 10:08:42 -04:00
parent 68d29554a8
commit e0e59f6020
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/shims/intrinsics.rs
View File

@ -173,35 +173,31 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
"frem_fast" => mir::BinOp::Rem,
_ => bug!(),
};
let a_valid = match a.layout.ty.kind() {
ty::Float(FloatTy::F32) => a.to_scalar()?.to_f32()?.is_finite(),
ty::Float(FloatTy::F64) => a.to_scalar()?.to_f64()?.is_finite(),
_ => bug!(
"`{}` called with non-float input type {:?}",
intrinsic_name,
a.layout.ty
),
let float_finite = |x: ImmTy<'tcx, _>| -> InterpResult<'tcx, bool> {
Ok(match x.layout.ty.kind() {
ty::Float(FloatTy::F32) => x.to_scalar()?.to_f32()?.is_finite(),
ty::Float(FloatTy::F64) => x.to_scalar()?.to_f64()?.is_finite(),
_ => bug!(
"`{}` called with non-float input type {:?}",
intrinsic_name,
x.layout.ty
),
})
};
if !a_valid {
throw_ub_format!(
match (float_finite(a)?, float_finite(b)?) {
(false, false) => throw_ub_format!(
"`{}` intrinsic called with non-finite value as both parameters",
intrinsic_name,
),
(false, _) => throw_ub_format!(
"`{}` intrinsic called with non-finite value as first parameter",
intrinsic_name,
);
}
let b_valid = match b.layout.ty.kind() {
ty::Float(FloatTy::F32) => b.to_scalar()?.to_f32()?.is_finite(),
ty::Float(FloatTy::F64) => b.to_scalar()?.to_f64()?.is_finite(),
_ => bug!(
"`{}` called with non-float input type {:?}",
intrinsic_name,
b.layout.ty
),
};
if !b_valid {
throw_ub_format!(
(_, false) => throw_ub_format!(
"`{}` intrinsic called with non-finite value as second parameter",
intrinsic_name,
);
),
_ => {}
}
this.binop_ignore_overflow(op, &a, &b, dest)?;
}

2
tests/compile-fail/fast_math_both.rs
View File

@ -2,6 +2,6 @@
fn main() {
unsafe {
let _x: f32 = core::intrinsics::frem_fast(f32::NAN, 3.2); //~ ERROR `frem_fast` intrinsic called with non-finite value as first parameter
let _x: f32 = core::intrinsics::fsub_fast(f32::NAN, f32::NAN); //~ ERROR `fsub_fast` intrinsic called with non-finite value as both parameters
}
}

2
tests/compile-fail/fast_math_first.rs
View File

@ -2,6 +2,6 @@
fn main() {
unsafe {
let _x: f32 = core::intrinsics::fsub_fast(f32::NAN, f32::NAN); //~ ERROR `fsub_fast` intrinsic called with non-finite value as first parameter
let _x: f32 = core::intrinsics::frem_fast(f32::NAN, 3.2); //~ ERROR `frem_fast` intrinsic called with non-finite value as first parameter
}
}