mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename memory hooks

Browse Source
This commit is contained in:
Ben Kimock 2022-08-15 18:13:11 -04:00 committed by Ben Kimock
parent a000764fb9
commit 7c18b38e04
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine.rs
View File

@ -780,7 +780,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
} }
#[inline(always)] #[inline(always)]
fn memory_read( fn before_memory_read(
_tcx: TyCtxt<'tcx>, _tcx: TyCtxt<'tcx>,
machine: &Self, machine: &Self,
alloc_extra: &AllocExtra, alloc_extra: &AllocExtra,
@ -796,7 +796,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
)?; )?;
} }
if let Some(stacked_borrows) = &alloc_extra.stacked_borrows { if let Some(stacked_borrows) = &alloc_extra.stacked_borrows {
stacked_borrows.borrow_mut().memory_read( stacked_borrows.borrow_mut().before_memory_read(
alloc_id, alloc_id,
prov_extra, prov_extra,
range, range,
@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
} }
#[inline(always)] #[inline(always)]
fn memory_written( fn before_memory_write(
_tcx: TyCtxt<'tcx>, _tcx: TyCtxt<'tcx>,
machine: &mut Self, machine: &mut Self,
alloc_extra: &mut AllocExtra, alloc_extra: &mut AllocExtra,
@ -828,7 +828,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
)?; )?;
} }
if let Some(stacked_borrows) = &mut alloc_extra.stacked_borrows { if let Some(stacked_borrows) = &mut alloc_extra.stacked_borrows {
stacked_borrows.get_mut().memory_written( stacked_borrows.get_mut().before_memory_write(
alloc_id, alloc_id,
prov_extra, prov_extra,
range, range,
@ -844,7 +844,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
} }
#[inline(always)] #[inline(always)]
fn memory_deallocated( fn before_memory_deallocation(
_tcx: TyCtxt<'tcx>, _tcx: TyCtxt<'tcx>,
machine: &mut Self, machine: &mut Self,
alloc_extra: &mut AllocExtra, alloc_extra: &mut AllocExtra,
@ -863,7 +863,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
)?; )?;
} }
if let Some(stacked_borrows) = &mut alloc_extra.stacked_borrows { if let Some(stacked_borrows) = &mut alloc_extra.stacked_borrows {
stacked_borrows.get_mut().memory_deallocated( stacked_borrows.get_mut().before_memory_deallocation(
alloc_id, alloc_id,
prove_extra, prove_extra,
range, range,

6
src/stacked_borrows/mod.rs
View File

@ -657,7 +657,7 @@ impl Stacks {
} }
#[inline(always)] #[inline(always)]
pub fn memory_read<'tcx>( pub fn before_memory_read<'tcx>(
&mut self, &mut self,
alloc_id: AllocId, alloc_id: AllocId,
tag: ProvenanceExtra, tag: ProvenanceExtra,
@ -688,7 +688,7 @@ impl Stacks {
} }
#[inline(always)] #[inline(always)]
pub fn memory_written<'tcx>( pub fn before_memory_write<'tcx>(
&mut self, &mut self,
alloc_id: AllocId, alloc_id: AllocId,
tag: ProvenanceExtra, tag: ProvenanceExtra,
@ -719,7 +719,7 @@ impl Stacks {
} }
#[inline(always)] #[inline(always)]
pub fn memory_deallocated<'tcx>( pub fn before_memory_deallocation<'tcx>(
&mut self, &mut self,
alloc_id: AllocId, alloc_id: AllocId,
tag: ProvenanceExtra, tag: ProvenanceExtra,