mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
Miri: GC the dead_alloc_map too
This commit is contained in:
parent
0ff8610964
commit
f5dae8e73c
@ -501,6 +501,17 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
|
||||
/// This function is used by Miri's provenance GC to remove unreachable entries from the dead_alloc_map.
|
||||
pub fn remove_unreachable_allocs(&mut self, reachable_allocs: &FxHashSet<AllocId>) {
|
||||
// Unlike all the other GC helpers where we check if an `AllocId` is found in the interpreter or
|
||||
// is live, here all the IDs in the map are for dead allocations so we don't
|
||||
// need to check for liveness.
|
||||
#[allow(rustc::potential_query_instability)] // Only used from Miri, not queries.
|
||||
self.memory.dead_alloc_map.retain(|id, _| reachable_allocs.contains(id));
|
||||
}
|
||||
}
|
||||
|
||||
/// Allocation accessors
|
||||
impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
|
||||
/// Helper function to obtain a global (tcx) allocation.
|
||||
|
@ -195,7 +195,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriInterpCxExt<'mir, 'tcx> {
|
||||
}
|
||||
|
||||
fn remove_unreachable_allocs(&mut self, allocs: FxHashSet<AllocId>) {
|
||||
let this = self.eval_context_ref();
|
||||
let this = self.eval_context_mut();
|
||||
let allocs = LiveAllocs {
|
||||
ecx: this,
|
||||
collected: allocs,
|
||||
@ -205,5 +205,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriInterpCxExt<'mir, 'tcx> {
|
||||
if let Some(borrow_tracker) = &this.machine.borrow_tracker {
|
||||
borrow_tracker.borrow_mut().remove_unreachable_allocs(&allocs);
|
||||
}
|
||||
this.remove_unreachable_allocs(&allocs.collected);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user