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

References to ZSTs may be at arbitrary aligned addresses

Browse source
This commit is contained in:
Oliver Scherer 2020-09-30 10:40:49 +02:00
parent 4d52dc4790
commit ce6c25da58
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ use rustc_middle::ty::print::with_no_trimmed_paths;
use rustc_middle::ty::{self, subst::Subst, TyCtxt};
use rustc_span::source_map::Span;
use rustc_target::abi::{Abi, LayoutOf};
use std::convert::TryInto;
use std::convert::{TryFrom, TryInto};
pub fn note_on_undefined_behavior_error() -> &'static str {
"The rules on what exactly is undefined behavior aren't clear, \
@ -148,10 +148,10 @@ pub(super) fn op_to_const<'tcx>(
Scalar::Raw { data, .. } => {
assert!(mplace.layout.is_zst());
assert_eq!(
data,
mplace.layout.align.abi.bytes().into(),
"this MPlaceTy must come from `try_as_mplace` being used on a zst, so we know what
value this integer address must have",
u64::try_from(data).unwrap() % mplace.layout.align.abi.bytes(),
0,
"this MPlaceTy must come from a validated constant, thus we can assume the \
alignment is correct",
);
ConstValue::Scalar(Scalar::zst())
}