Auto merge of #2488 - saethlin:rename-memory-hooks, r=RalfJung

Rename memory hooks Companion to rust-lang/rust#100600
rust-lang · Aug 16, 2022 · 39c606f · 39c606f
2 parents 793f198 + 3992f06
commit 39c606f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-2fbc08e2ce64dee45a29cb6133da6b32366268aa
+8556e6620e4866526b3cea767ad8c20ae877a569
diff --git a/src/machine.rs b/src/machine.rs
@@ -780,7 +780,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn memory_read(
+    fn before_memory_read(
         _tcx: TyCtxt<'tcx>,
         machine: &Self,
         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 {
-            stacked_borrows.borrow_mut().memory_read(
+            stacked_borrows.borrow_mut().before_memory_read(
                 alloc_id,
                 prov_extra,
                 range,
@@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn memory_written(
+    fn before_memory_write(
         _tcx: TyCtxt<'tcx>,
         machine: &mut Self,
         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 {
-            stacked_borrows.get_mut().memory_written(
+            stacked_borrows.get_mut().before_memory_write(
                 alloc_id,
                 prov_extra,
                 range,
@@ -844,7 +844,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn memory_deallocated(
+    fn before_memory_deallocation(
         _tcx: TyCtxt<'tcx>,
         machine: &mut Self,
         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 {
-            stacked_borrows.get_mut().memory_deallocated(
+            stacked_borrows.get_mut().before_memory_deallocation(
                 alloc_id,
                 prove_extra,
                 range,

diff --git a/src/stacked_borrows/mod.rs b/src/stacked_borrows/mod.rs
@@ -657,7 +657,7 @@ impl Stacks {
     }
 
     #[inline(always)]
-    pub fn memory_read<'tcx>(
+    pub fn before_memory_read<'tcx>(
         &mut self,
         alloc_id: AllocId,
         tag: ProvenanceExtra,
@@ -688,7 +688,7 @@ impl Stacks {
     }
 
     #[inline(always)]
-    pub fn memory_written<'tcx>(
+    pub fn before_memory_write<'tcx>(
         &mut self,
         alloc_id: AllocId,
         tag: ProvenanceExtra,
@@ -719,7 +719,7 @@ impl Stacks {
     }
 
     #[inline(always)]
-    pub fn memory_deallocated<'tcx>(
+    pub fn before_memory_deallocation<'tcx>(
         &mut self,
         alloc_id: AllocId,
         tag: ProvenanceExtra,