fix nits

RalfJung · RalfJung · commit 40950b2cd18a · 2017-07-21T20:02:48.000-07:00
diff --git a/src/librustc_mir/interpret/cast.rs b/src/librustc_mir/interpret/cast.rs
@@ -77,8 +77,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
             TyChar if v as u8 as u128 == v => Ok(PrimVal::Bytes(v)),
             TyChar => Err(EvalError::InvalidChar(v)),
 
-            // No alignment check needed for raw pointers
-            TyRawPtr(_) => Ok(PrimVal::Bytes(v % (1 << (self.memory.pointer_size()*8)))),
+            // No alignment check needed for raw pointers.  But we have to truncate to target ptr size.
+            TyRawPtr(_) => Ok(PrimVal::Bytes(v % (1u128 << self.memory.layout.pointer_size.bits()))),
 
             _ => Err(EvalError::Unimplemented(format!("int to {:?} cast", ty))),
         }

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {`
`77`	`77`	`TyChar if v as u8 as u128 == v => Ok(PrimVal::Bytes(v)),`
`78`	`78`	`TyChar => Err(EvalError::InvalidChar(v)),`
`79`	`79`
`80`		`- // No alignment check needed for raw pointers`
`81`		`- TyRawPtr(_) => Ok(PrimVal::Bytes(v % (1 << (self.memory.pointer_size()*8)))),`
	`80`	`+ // No alignment check needed for raw pointers. But we have to truncate to target ptr size.`
	`81`	`+ TyRawPtr(_) => Ok(PrimVal::Bytes(v % (1u128 << self.memory.layout.pointer_size.bits()))),`
`82`	`82`
`83`	`83`	`_ => Err(EvalError::Unimplemented(format!("int to {:?} cast", ty))),`
`84`	`84`	`}`