cleanup

Author: Vanille-N

src/borrow_tracker/mod.rs

@@ -274,20 +274,20 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
         &mut self,
         kind: RetagKind,
         place: &PlaceTy<'tcx, Provenance>,
-        borrow_tracker_method: BorrowTrackerMethod,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        match borrow_tracker_method {
+        let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
+        match method {
             BorrowTrackerMethod::StackedBorrows => this.sb_retag(kind, place),
         }
     }
 
     fn retag_return_place(
         &mut self,
-        borrow_tracker_method: BorrowTrackerMethod,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        match borrow_tracker_method {
+        let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
+        match method {
             BorrowTrackerMethod::StackedBorrows => this.sb_retag_return_place(),
         }
     }
@@ -296,10 +296,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
         &mut self,
         alloc_id: AllocId,
         tag: BorTag,
-        borrow_tracker_method: BorrowTrackerMethod,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        match borrow_tracker_method {
+        let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().method();
+        match method {
             BorrowTrackerMethod::StackedBorrows => this.sb_expose_tag(alloc_id, tag),
         }
     }

src/borrow_tracker/stacked_borrows/mod.rs

@@ -566,11 +566,12 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
                     // if converting this alloc_id from a global to a local one
                     // uncovers a non-supported `extern static`.
                     let extra = this.get_alloc_extra(alloc_id)?;
-                    let sb = extra
+                    let mut stacked_borrows = extra
                         .borrow_tracker
                         .as_ref()
                         .expect("We should have borrow tracking data")
-                        .assert_sb();
+                        .assert_sb()
+                        .borrow_mut();
                     // Note that we create a *second* `DiagnosticCxBuilder` below for the actual retag.
                     // FIXME: can this be done cleaner?
                     let dcx = DiagnosticCxBuilder::retag(
@@ -580,7 +581,6 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
                         orig_tag,
                         alloc_range(base_offset, size),
                     );
-                    let mut stacked_borrows = sb.borrow_mut();
                     let mut dcx = dcx.build(&mut stacked_borrows.history, base_offset);
                     dcx.log_creation();
                     if protect.is_some() {

src/intptrcast.rs

@@ -112,9 +112,8 @@ impl<'mir, 'tcx> GlobalStateInner {
         if global_state.provenance_mode != ProvenanceMode::Strict {
             trace!("Exposing allocation id {alloc_id:?}");
             global_state.exposed.insert(alloc_id);
-            if let Some(borrow_tracker) = &ecx.machine.borrow_tracker {
-                let method = borrow_tracker.borrow().method();
-                ecx.expose_tag(alloc_id, tag, method)?;
+            if ecx.machine.borrow_tracker.is_some() {
+                ecx.expose_tag(alloc_id, tag)?;
             }
         }
         Ok(())

src/lib.rs

@@ -85,7 +85,7 @@ pub use crate::shims::tls::TlsData;
 pub use crate::shims::EvalContextExt as _;
 
 pub use crate::borrow_tracker::stacked_borrows::{
-    EvalContextExt as StackedBorEvalContextExt, Item, Permission, Stack, Stacks,
+    EvalContextExt as _, Item, Permission, Stack, Stacks,
 };
 pub use crate::borrow_tracker::{
     BorTag, BorrowTrackerMethod, CallId, EvalContextExt as _, RetagFields,

src/machine.rs

@@ -254,8 +254,7 @@ impl ProvenanceExtra {
 /// Extra per-allocation data
 #[derive(Debug, Clone)]
 pub struct AllocExtra {
-    /// Stacked Borrows state. Although it is always added,
-    /// one of the implementations does nothing
+    /// Global state of the borrow tracker, if enabled.
     pub borrow_tracker: Option<borrow_tracker::AllocExtra>,
     /// Data race detection via the use of a vector-clock,
     ///  this is only added if it is enabled.
@@ -1061,9 +1060,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
         kind: mir::RetagKind,
         place: &PlaceTy<'tcx, Provenance>,
     ) -> InterpResult<'tcx> {
-        if let Some(borrow_tracker) = &ecx.machine.borrow_tracker {
-            let method = borrow_tracker.borrow().method();
-            ecx.retag(kind, place, method)?;
+        if ecx.machine.borrow_tracker.is_some() {
+            ecx.retag(kind, place)?;
         }
         Ok(())
     }
@@ -1150,9 +1148,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
             let stack_len = ecx.active_thread_stack().len();
             ecx.active_thread_mut().set_top_user_relevant_frame(stack_len - 1);
         }
-        if let Some(borrow_tracker) = &ecx.machine.borrow_tracker {
-            let method = borrow_tracker.borrow().method();
-            ecx.retag_return_place(method)?;
+        if ecx.machine.borrow_tracker.is_some() {
+            ecx.retag_return_place()?;
         }
         Ok(())
     }