De-duplicate and move adjust_nan to InterpCx

Author: eduardosm

compiler/rustc_const_eval/src/interpret/cast.rs

@@ -334,19 +334,6 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 {
 use rustc_type_ir::TyKind::*;
 
-fnadjust_nan<
-'tcx,
-M:Machine<'tcx>,
-F1: rustc_apfloat::Float + FloatConvert<F2>,
-F2: rustc_apfloat::Float,
->(
-ecx:&InterpCx<'tcx,M>,
-f1:F1,
-f2:F2,
-) -> F2{
-if f2.is_nan(){M::generate_nan(ecx,&[f1])}else{ f2 }
-}
-
 match*dest_ty.kind(){
 // float -> uint
 Uint(t) => {
@@ -367,11 +354,17 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 }
 // float -> float
 Float(fty) => match fty {
-FloatTy::F16 => Scalar::from_f16(adjust_nan(self, f, f.convert(&mutfalse).value)),
-FloatTy::F32 => Scalar::from_f32(adjust_nan(self, f, f.convert(&mutfalse).value)),
-FloatTy::F64 => Scalar::from_f64(adjust_nan(self, f, f.convert(&mutfalse).value)),
+FloatTy::F16 => {
+Scalar::from_f16(self.adjust_nan(f.convert(&mutfalse).value,&[f]))
+}
+FloatTy::F32 => {
+Scalar::from_f32(self.adjust_nan(f.convert(&mutfalse).value,&[f]))
+}
+FloatTy::F64 => {
+Scalar::from_f64(self.adjust_nan(f.convert(&mutfalse).value,&[f]))
+}
 FloatTy::F128 => {
-Scalar::from_f128(adjust_nan(self, f, f.convert(&mutfalse).value))
+Scalar::from_f128(self.adjust_nan(f.convert(&mutfalse).value,&[f]))
 }
 },
 // That's it.

compiler/rustc_const_eval/src/interpret/eval_context.rs

@@ -599,6 +599,14 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 pubfngenerate_stacktrace(&self) -> Vec<FrameInfo<'tcx>>{
 Frame::generate_stacktrace_from_stack(self.stack())
 }
+
+pubfnadjust_nan<F1,F2>(&self,f:F2,inputs:&[F1]) -> F2
+where
+F1: rustc_apfloat::Float + rustc_apfloat::FloatConvert<F2>,
+F2: rustc_apfloat::Float,
+{
+if f.is_nan(){M::generate_nan(self, inputs)}else{ f }
+}
 }
 
 #[doc(hidden)]

compiler/rustc_const_eval/src/interpret/operator.rs

@@ -64,8 +64,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 use rustc_middle::mir::BinOp::*;
 
 // Performs appropriate non-deterministic adjustments of NaN results.
-let adjust_nan =
- |f:F| -> F{if f.is_nan(){M::generate_nan(self,&[l, r])}else{ f }};
+let adjust_nan = |f:F| -> F{self.adjust_nan(f,&[l, r])};
 
 match bin_op {
 Eq => ImmTy::from_bool(l == r,*self.tcx),

src/tools/miri/src/operator.rs

@@ -115,8 +115,4 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  nan
 }
 }
-
-fnadjust_nan<F1:Float + FloatConvert<F2>,F2:Float>(&self,f:F2,inputs:&[F1]) -> F2{
-if f.is_nan(){self.generate_nan(inputs)}else{ f }
-}
 }