1
Fork 0

Rollup merge of #124018 - RalfJung:dealloc-memory-kind, r=oli-obk

interpret: pass MemoryKind to before_memory_deallocation

This will be needed for https://github.com/rust-lang/miri/pull/3475.

r? ``@oli-obk``
This commit is contained in:
Matthias Krüger 2024-04-16 17:54:45 +02:00 committed by GitHub
commit 864ab0cc36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 21 additions and 18 deletions

View file

@ -427,6 +427,7 @@ pub trait Machine<'mir, 'tcx: 'mir>: Sized {
_prov: (AllocId, Self::ProvenanceExtra),
_size: Size,
_align: Align,
_kind: MemoryKind<Self::MemoryKind>,
) -> InterpResult<'tcx> {
Ok(())
}

View file

@ -355,6 +355,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
(alloc_id, prov),
size,
alloc.align,
kind,
)?;
// Don't forget to remember size and align of this now-dead allocation