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

Clarify pattern matching

Browse source
This commit is contained in:
Ralf Jung 2017-06-23 11:12:17 -07:00
parent fbc00ddc95
commit 38d03392fa
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/eval_context.rs
View file

@ -676,21 +676,26 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
// Check alignment and non-NULLness.
let (_, align) = self.size_and_align_of_dst(ty, val)?;
if ptr.is_ptr() {
let ptr = ptr.to_ptr()?;
if !ptr.points_to_zst() { // assume ZST pointer to be always fully alignd (and anyway ZST pointers are going to disappear soon)
self.memory.check_align(ptr, align, 0)?;
match ptr {
PrimVal::Ptr(ptr) => {
if !ptr.points_to_zst() { // assume ZST pointer to be always fully alignd (and anyway ZST pointers are going to disappear soon)
self.memory.check_align(ptr, align, 0)?;
}
}
} else {
let v = (ptr.to_u128()? % (1 << self.memory.pointer_size())) as u64;
if v == 0 {
return Err(EvalError::InvalidNullPointerUsage);
PrimVal::Bytes(bytes) => {
let v = ((bytes as u128) % (1 << self.memory.pointer_size())) as u64;
if v == 0 {
return Err(EvalError::InvalidNullPointerUsage);
}
if v % align != 0 {
return Err(EvalError::AlignmentCheckFailed {
has: v % align,
required: align,
});
}
}
if v % align != 0 {
return Err(EvalError::AlignmentCheckFailed {
has: v % align,
required: align,
});
PrimVal::Undef => {
return Err(EvalError::ReadUndefBytes);
}
}