From fd022857880175900dd22533ec7243ff0fa5ad49 Mon Sep 17 00:00:00 2001 From: Scott Olson Date: Sat, 26 Nov 2016 23:42:17 -0800 Subject: [PATCH] Remove unnecessary transmute_primval function. --- src/interpreter/cast.rs | 4 ++-- src/interpreter/mod.rs | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/interpreter/cast.rs b/src/interpreter/cast.rs index 4b0c91b00ab..7a0285da440 100644 --- a/src/interpreter/cast.rs +++ b/src/interpreter/cast.rs @@ -97,8 +97,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { fn cast_ptr(&self, ptr: Pointer, ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> { use rustc::ty::TypeVariants::*; match ty.sty { - TyRef(..) | TyRawPtr(_) | TyFnPtr(_) => Ok(PrimVal::from_ptr(ptr)), - TyInt(_) | TyUint(_) => self.transmute_primval(PrimVal::from_ptr(ptr), ty), + TyRef(..) | TyRawPtr(_) | TyFnPtr(_) | TyInt(_) | TyUint(_) => + Ok(PrimVal::from_ptr(ptr)), _ => Err(EvalError::Unimplemented(format!("ptr to {:?} cast", ty))), } } diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs index c5794e63e8f..63d3029e311 100644 --- a/src/interpreter/mod.rs +++ b/src/interpreter/mod.rs @@ -1165,20 +1165,14 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> { Value::ByRef(_) => bug!("follow_by_ref_value can't result in `ByRef`"), Value::ByVal(primval) => { - let new_primval = self.transmute_primval(primval, ty)?; - self.ensure_valid_value(new_primval, ty)?; - Ok(new_primval) + self.ensure_valid_value(primval, ty)?; + Ok(primval) } Value::ByValPair(..) => bug!("value_to_primval can't work with fat pointers"), } } - // FIXME(solson): Delete this. - fn transmute_primval(&self, val: PrimVal, _ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> { - Ok(val) - } - fn write_primval( &mut self, dest: Lvalue<'tcx>,