bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Split the "raw integer bytes" part out of Scalar

Browse source
This commit is contained in:
Oliver Scherer 2020-09-26 15:15:35 +02:00 • committed by oli
parent 56293097f7
commit 362123dd75
17 changed files with 325 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir/src/const_eval/eval_queries.rs
View file

@ -137,10 +137,10 @@ pub(super) fn op_to_const<'tcx>(
let alloc = ecx.tcx.global_alloc(ptr.alloc_id).unwrap_memory();
ConstValue::ByRef { alloc, offset: ptr.offset }
}
Scalar::Raw { data, .. } => {
Scalar::Raw(int) => {
assert!(mplace.layout.is_zst());
assert_eq!(
u64::try_from(data).unwrap() % mplace.layout.align.abi.bytes(),
u64::try_from(int).unwrap() % mplace.layout.align.abi.bytes(),
0,
"this MPlaceTy must come from a validated constant, thus we can assume the \
alignment is correct",