bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

finally enable Scalar layout sanity checks

Browse source
This commit is contained in:
Ralf Jung 2022-07-05 20:26:26 -04:00
parent f342bea9d1
commit 8f867c5445
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_const_eval/src/interpret/operand.rs
View file

@ -306,9 +306,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
s.is_ptr() || (number_may_have_provenance && size == self.pointer_size())
};
if let Some(s) = scalar_layout {
//FIXME(#96185): let size = s.size(self);
//FIXME(#96185): assert_eq!(size, mplace.layout.size, "abi::Scalar size does not match layout size");
let size = mplace.layout.size; //FIXME(#96185): remove this line
let size = s.size(self);
assert_eq!(size, mplace.layout.size, "abi::Scalar size does not match layout size");
let scalar =
alloc.read_scalar(alloc_range(Size::ZERO, size), read_provenance(s, size))?;
return Ok(Some(ImmTy { imm: scalar.into(), layout: mplace.layout }));