mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use correct alignment checks for scalars and zsts, too

Browse source
This commit is contained in:
Oliver Scherer 2018-11-15 18:05:15 +01:00
parent 927c5aab47
commit 9b8e82ad24
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_mir/interpret/operand.rs
View file

@ -271,13 +271,13 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
if mplace.layout.is_zst() { if mplace.layout.is_zst() {
// Not all ZSTs have a layout we would handle below, so just short-circuit them // Not all ZSTs have a layout we would handle below, so just short-circuit them
// all here. // all here.
self.memory.check_align(ptr, ptr_align)?; self.memory.check_align(ptr, ptr_align.min(mplace.layout.align))?;
return Ok(Some(Immediate::Scalar(Scalar::zst().into()))); return Ok(Some(Immediate::Scalar(Scalar::zst().into())));
} }
// check for integer pointers before alignment to report better errors // check for integer pointers before alignment to report better errors
let ptr = ptr.to_ptr()?; let ptr = ptr.to_ptr()?;
self.memory.check_align(ptr.into(), ptr_align)?; self.memory.check_align(ptr.into(), ptr_align.min(mplace.layout.align))?;
match mplace.layout.abi { match mplace.layout.abi {
layout::Abi::Scalar(..) => { layout::Abi::Scalar(..) => {
let scalar = self.memory let scalar = self.memory