user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check Pointer::to_int for non-integer pointers

Browse source
This commit is contained in:
Oliver Schneider 2016-09-26 11:37:23 +02:00
parent c874290054
commit fcbaf990f2
No known key found for this signature in database
GPG key ID: 56D6EEA0FC67AC46
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/interpreter/cast.rs
View file

@ -8,7 +8,7 @@ use primval::PrimVal;
use memory::Pointer;
use rustc::ty::Ty;
use syntax::ast;
use syntax::ast::{self, IntTy, UintTy};
impl<'a, 'tcx> EvalContext<'a, 'tcx> {
pub(super) fn cast_primval(&self, val: PrimVal, ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> {
@ -38,6 +38,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
ty::TyRef(..) |
ty::TyRawPtr(_) => Ok(Ptr(ptr)),
ty::TyFnPtr(_) => Ok(FnPtr(ptr)),
// FIXME: can truncation happen here?
ty::TyInt(IntTy::I8) => Ok(I8(ptr.to_int()? as i8)),
ty::TyInt(IntTy::I16) => Ok(I16(ptr.to_int()? as i16)),
ty::TyInt(IntTy::I32) => Ok(I32(ptr.to_int()? as i32)),
ty::TyInt(IntTy::I64) => Ok(I64(ptr.to_int()? as i64)),
ty::TyUint(UintTy::U8) => Ok(U8(ptr.to_int()? as u8)),
ty::TyUint(UintTy::U16) => Ok(U16(ptr.to_int()? as u16)),
ty::TyUint(UintTy::U32) => Ok(U32(ptr.to_int()? as u32)),
ty::TyUint(UintTy::U64) => Ok(U64(ptr.to_int()? as u64)),
_ => Err(EvalError::Unimplemented(format!("ptr to {:?} cast", ty))),
}
}

8
src/memory.rs
View file

@ -55,8 +55,12 @@ impl Pointer {
pub fn points_to_zst(&self) -> bool {
self.alloc_id == ZST_ALLOC_ID
}
pub fn to_int(&self) -> usize {
self.offset
pub fn to_int<'tcx>(&self) -> EvalResult<'tcx, usize> {
if self.points_to_zst() {
Ok(self.offset)
} else {
Err(EvalError::ReadPointerAsBytes)
}
}
pub fn from_int(i: usize) -> Self {
Pointer {

4
src/primval.rs
View file

@ -46,7 +46,7 @@ impl PrimVal {
U16(u) => u as u64,
U32(u) => u as u64,
U64(u) => u,
Ptr(ptr) => ptr.to_int() as u64,
Ptr(ptr) => ptr.to_int().expect("non abstract ptr") as u64,
_ => bug!("{}", error_msg),
}
}
@ -58,7 +58,7 @@ impl PrimVal {
I16(i) => i as i64,
I32(i) => i as i64,
I64(i) => i,
Ptr(ptr) => ptr.to_int() as i64,
Ptr(ptr) => ptr.to_int().expect("non abstract ptr") as i64,
_ => bug!("{}", error_msg),
}
}