bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Copy undef_masks correctly for repeated bytes

Browse source
This commit is contained in:
Wesley Wiser 2018-06-30 14:23:41 -04:00
parent 84fe0c40a1
commit faef6a30e6
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_mir/interpret/memory.rs
View file

@ -666,7 +666,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
} }
} }
self.copy_undef_mask(src, dest, size * length)?; self.copy_undef_mask(src, dest, size, length)?;
// copy back the relocations // copy back the relocations
self.get_mut(dest.alloc_id)?.relocations.insert_presorted(relocations); self.get_mut(dest.alloc_id)?.relocations.insert_presorted(relocations);
@ -887,6 +887,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
src: Pointer, src: Pointer,
dest: Pointer, dest: Pointer,
size: Size, size: Size,
repeat: u64,
) -> EvalResult<'tcx> { ) -> EvalResult<'tcx> {
// The bits have to be saved locally before writing to dest in case src and dest overlap. // The bits have to be saved locally before writing to dest in case src and dest overlap.
assert_eq!(size.bytes() as usize as u64, size.bytes()); assert_eq!(size.bytes() as usize as u64, size.bytes());
@ -896,10 +897,13 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
for i in 0..size.bytes() { for i in 0..size.bytes() {
let defined = undef_mask.get(src.offset + Size::from_bytes(i)); let defined = undef_mask.get(src.offset + Size::from_bytes(i));
dest_allocation.undef_mask.set(
dest.offset + Size::from_bytes(i), for j in 0..repeat {
defined dest_allocation.undef_mask.set(
); dest.offset + Size::from_bytes(i + (size.bytes() * j)),
defined
);
}
} }
Ok(()) Ok(())