Skip to content
Permalink
Browse files

Early abort validation of arrays of zsts because there is no data to …

…be checked
  • Loading branch information
oli-obk committed Jan 13, 2020
1 parent 2d8d559 commit 19b9b26986246b92e1f686a9a7b29da42a79ed9f
Showing with 8 additions and 3 deletions.
  1. +8 −3 src/librustc_mir/interpret/validity.rs
@@ -608,9 +608,14 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
return Ok(());
}
// This is the element type size.
let ty_size = self.ecx.layout_of(tys)?.size;
let layout = self.ecx.layout_of(tys)?;
// Empty tuples and fieldless structs (the only ZSTs that allow reaching this code)
// have no data to be checked.
if layout.is_zst() {
return Ok(());
}
// This is the size in bytes of the whole array.
let size = ty_size * len;
let size = layout.size * len;
// Size is not 0, get a pointer.
let ptr = self.ecx.force_ptr(mplace.ptr)?;

@@ -640,7 +645,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
// Some byte was undefined, determine which
// element that byte belongs to so we can
// provide an index.
let i = (offset.bytes() / ty_size.bytes()) as usize;
let i = (offset.bytes() / layout.size.bytes()) as usize;
self.path.push(PathElem::ArrayElem(i));

throw_validation_failure!("undefined bytes", self.path)

0 comments on commit 19b9b26

Please sign in to comment.
You can’t perform that action at this time.