bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #115184 - saethlin:local-allocated-spans, r=RalfJung

Browse source 
Record allocation spans inside force_allocation

This expands https://github.com/rust-lang/miri/pull/2940 to cover locals

r? `@RalfJung`
This commit is contained in:
bors 2023-08-25 17:03:33 +00:00
commit 296c7a683c
10 changed files with 110 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_const_eval/src/interpret/machine.rs
View file

@ -18,7 +18,7 @@ use crate::const_eval::CheckAlignment;
use super::{
AllocBytes, AllocId, AllocRange, Allocation, ConstAllocation, FnArg, Frame, ImmTy, InterpCx,
InterpResult, MemoryKind, OpTy, Operand, PlaceTy, Pointer, Provenance, Scalar,
InterpResult, MPlaceTy, MemoryKind, OpTy, Operand, PlaceTy, Pointer, Provenance, Scalar,
};
/// Data returned by Machine::stack_pop,
@ -475,6 +475,18 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
assert!(!unwinding);
Ok(StackPopJump::Normal)
}
/// Called immediately after actual memory was allocated for a local
/// but before the local's stack frame is updated to point to that memory.
#[inline(always)]
fn after_local_allocated(
_ecx: &mut InterpCx<'mir, 'tcx, Self>,
_frame: usize,
_local: mir::Local,
_mplace: &MPlaceTy<'tcx, Self::Provenance>,
) -> InterpResult<'tcx> {
Ok(())
}
}
/// A lot of the flexibility above is just needed for `Miri`, but all "compile-time" machines

9
compiler/rustc_const_eval/src/interpret/place.rs
View file

@ -899,7 +899,7 @@ where
if local_layout.is_unsized() {
throw_unsup_format!("unsized locals are not supported");
}
let mplace = *self.allocate(local_layout, MemoryKind::Stack)?;
let mplace = self.allocate(local_layout, MemoryKind::Stack)?;
// Preserve old value. (As an optimization, we can skip this if it was uninit.)
if !matches!(local_val, Immediate::Uninit) {
// We don't have to validate as we can assume the local was already
@ -909,15 +909,16 @@ where
local_val,
local_layout,
local_layout.align.abi,
mplace,
*mplace,
)?;
}
M::after_local_allocated(self, frame, local, &mplace)?;
// Now we can call `access_mut` again, asserting it goes well, and actually
// overwrite things. This points to the entire allocation, not just the part
// the place refers to, i.e. we do this before we apply `offset`.
*M::access_local_mut(self, frame, local).unwrap() =
Operand::Indirect(mplace);
mplace
Operand::Indirect(*mplace);
*mplace
}
&mut Operand::Indirect(mplace) => mplace, // this already was an indirect local
};