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

Verify that the alloc_id is Memory.

Browse source
This commit is contained in:
Camille GILLOT 2023-10-22 14:49:00 +00:00
parent c4cc9ca060
commit d80eb3a498
4 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_mir_transform/src/gvn.rs
View file

@ -90,6 +90,7 @@ use rustc_hir::def::DefKind;
use rustc_index::bit_set::BitSet;
use rustc_index::IndexVec;
use rustc_macros::newtype_index;
use rustc_middle::mir::interpret::GlobalAlloc;
use rustc_middle::mir::visit::*;
use rustc_middle::mir::*;
use rustc_middle::ty::adjustment::PointerCoercion;
@ -922,7 +923,11 @@ fn op_to_prop_const<'tcx>(
let pointer = mplace.ptr().into_pointer_or_addr().ok()?;
let (alloc_id, offset) = pointer.into_parts();
intern_const_alloc_for_constprop(ecx, alloc_id).ok()?;
return Some(ConstValue::Indirect { alloc_id, offset });
if matches!(ecx.tcx.global_alloc(alloc_id), GlobalAlloc::Memory(_)) {
// `alloc_id` may point to a static. Codegen will choke on an `Indirect` with anything
// by `GlobalAlloc::Memory`, so do fall through to copying if needed.
return Some(ConstValue::Indirect { alloc_id, offset });
}
}
// Everything failed: create a new allocation to hold the data.