bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove unnecessary relocation check in const_prop

Browse source
This commit is contained in:
Ralf Jung 2020-03-31 15:25:12 +02:00
parent 2113659479
commit afe1ffb190
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_mir/transform/const_prop.rs
View file

@ -274,19 +274,16 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
_memory_extra: &(), _memory_extra: &(),
_alloc_id: AllocId, _alloc_id: AllocId,
allocation: &Allocation<Self::PointerTag, Self::AllocExtra>, allocation: &Allocation<Self::PointerTag, Self::AllocExtra>,
static_def_id: Option<DefId>, _static_def_id: Option<DefId>,
is_write: bool, is_write: bool,
) -> InterpResult<'tcx> { ) -> InterpResult<'tcx> {
if is_write { if is_write {
throw_machine_stop_str!("can't write to global"); throw_machine_stop_str!("can't write to global");
} }
// If the static allocation is mutable or if it has relocations (it may be legal to mutate // If the static allocation is mutable, then we can't const prop it as its content
// the memory behind that in the future), then we can't const prop it. // might be different at runtime.
if allocation.mutability == Mutability::Mut { if allocation.mutability == Mutability::Mut {
throw_machine_stop_str!("can't eval mutable globals in ConstProp"); throw_machine_stop_str!("can't access mutable globals in ConstProp");
}
if static_def_id.is_some() && allocation.relocations().len() > 0 {
throw_machine_stop_str!("can't eval statics with pointers in ConstProp");
} }
Ok(()) Ok(())