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

promoteds in statics may refer to statics

Browse source
This commit is contained in:
Ralf Jung 2020-12-20 19:34:29 +01:00
parent 06ca7b700c
commit 97cae9c555
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -387,8 +387,12 @@ pub fn eval_to_allocation_raw_provider<'tcx>(
let mut inner = false;
while let Some((mplace, path)) = ref_tracking.todo.pop() {
let mode = match tcx.static_mutability(cid.instance.def_id()) {
Some(_) if cid.promoted.is_none() => CtfeValidationMode::Regular, // a `static`
_ => CtfeValidationMode::Const { inner },
Some(_) if cid.promoted.is_some() => {
// Promoteds in statics are allowed to point to statics.
CtfeValidationMode::Const { inner, allow_static_ptrs: true }
}
Some(_) => CtfeValidationMode::Regular, // a `static`
None => CtfeValidationMode::Const { inner, allow_static_ptrs: false },
};
ecx.const_validate_operand(mplace.into(), path, &mut ref_tracking, mode)?;
inner = true;