bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix mplace_access_checked with forced alignment

Browse source
This commit is contained in:
Ralf Jung 2021-05-17 13:38:15 +02:00
parent 563ab4a106
commit d5ccf68a10
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_mir/src/interpret/place.rs
View file

@ -374,8 +374,9 @@ where
.size_and_align_of_mplace(&place)?
.unwrap_or((place.layout.size, place.layout.align.abi));
assert!(place.mplace.align <= align, "dynamic alignment less strict than static one?");
// Check (stricter) dynamic alignment, unless forced otherwise.
place.mplace.align = force_align.unwrap_or(align);
let align = force_align.unwrap_or(align);
// Record new (stricter, unless forced) alignment requirement in place.
place.mplace.align = align;
// When dereferencing a pointer, it must be non-null, aligned, and live.
if let Some(ptr) = self.memory.check_ptr_access(place.ptr, size, align)? {
place.mplace.ptr = ptr.into();