bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Directly intern values instead of copying them.

Browse source
This commit is contained in:
Camille GILLOT 2023-10-07 09:19:37 +00:00
parent 8162dc2433
commit ebc87bf567
3 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@
//! _c = *_b // replaced by _c = _a
//! ```
use rustc_const_eval::interpret::MemoryKind;
use rustc_const_eval::interpret::{intern_const_alloc_for_constprop, MemoryKind};
use rustc_const_eval::interpret::{ImmTy, InterpCx, MemPlaceMeta, OpTy, Projectable, Scalar};
use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
use rustc_data_structures::graph::dominators::Dominators;
@ -840,10 +840,13 @@ fn op_to_prop_const<'tcx>(
if let Either::Left(mplace) = op.as_mplace_or_imm()
&& let MemPlaceMeta::None = mplace.meta()
{
intern_const_alloc_for_constprop(ecx, &mplace).ok()?;
let pointer = mplace.ptr().into_pointer_or_addr().ok()?;
let (alloc_id, offset) = pointer.into_parts();
if matches!(ecx.tcx.try_get_global_alloc(alloc_id), Some(GlobalAlloc::Memory(_))) {
return Some(ConstValue::Indirect { alloc_id, offset })
match ecx.tcx.global_alloc(alloc_id) {
GlobalAlloc::Memory(_) => return Some(ConstValue::Indirect { alloc_id, offset }),
// Fallthrough to copying the data.
_ => {}
}
}