rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4225 from RalfJung/alloc_addresses

Browse Source 
alloc_addresses: use MemoryKind instead of tcx query to determine global allocations
This commit is contained in:
Ralf Jung
2025-03-12 18:06:50 +00:00
committed by GitHub
parent fe5235ee0f 0346e926a8
commit a004c12a7b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/miri/src/alloc_addresses/mod.rs
View File

@@ -170,20 +170,22 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
// This ensures the interpreted program and native code have the same view of memory. // This ensures the interpreted program and native code have the same view of memory.
let base_ptr = match info.kind { let base_ptr = match info.kind {
AllocKind::LiveData => { AllocKind::LiveData => {
if this.tcx.try_get_global_alloc(alloc_id).is_some() { if memory_kind == MiriMemoryKind::Global.into() {
// For new global allocations, we always pre-allocate the memory to be able use the machine address directly. // For new global allocations, we always pre-allocate the memory to be able use the machine address directly.
let prepared_bytes = MiriAllocBytes::zeroed(info.size, info.align) let prepared_bytes = MiriAllocBytes::zeroed(info.size, info.align)
.unwrap_or_else(|| { .unwrap_or_else(|| {
panic!("Miri ran out of memory: cannot create allocation of {size:?} bytes", size = info.size) panic!("Miri ran out of memory: cannot create allocation of {size:?} bytes", size = info.size)
}); });
let ptr = prepared_bytes.as_ptr(); let ptr = prepared_bytes.as_ptr();
// Store prepared allocation space to be picked up for use later. // Store prepared allocation to be picked up for use later.
global_state global_state
.prepared_alloc_bytes .prepared_alloc_bytes
.try_insert(alloc_id, prepared_bytes) .try_insert(alloc_id, prepared_bytes)
.unwrap(); .unwrap();
ptr ptr
} else { } else {
// Non-global allocations are already in memory at this point so
// we can just get a pointer to where their data is stored.
this.get_alloc_bytes_unchecked_raw(alloc_id)? this.get_alloc_bytes_unchecked_raw(alloc_id)?
} }
} }
@@ -382,6 +384,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
align: Align, align: Align,
) -> InterpResult<'tcx, MiriAllocBytes> { ) -> InterpResult<'tcx, MiriAllocBytes> {
let this = self.eval_context_ref(); let this = self.eval_context_ref();
assert!(this.tcx.try_get_global_alloc(id).is_some());
if this.machine.native_lib.is_some() { if this.machine.native_lib.is_some() {
// In native lib mode, MiriAllocBytes for global allocations are handled via `prepared_alloc_bytes`. // In native lib mode, MiriAllocBytes for global allocations are handled via `prepared_alloc_bytes`.
// This additional call ensures that some `MiriAllocBytes` are always prepared, just in case // This additional call ensures that some `MiriAllocBytes` are always prepared, just in case