From eb6d4cdac0dd2151a910109161588ffa52556dbb Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 31 May 2022 08:42:22 -0400
Subject: [PATCH 1/2] reduce some code duplication

---
 src/stacked_borrows.rs | 59 +++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index 2eba3511838..e2e63f8a52a 100644
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -705,6 +705,30 @@ fn reborrow(
         protect: bool,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
+        let current_span = &mut this.machine.current_span();
+
+        let log_creation = |this: &MiriEvalContext<'mir, 'tcx>,
+                            current_span: &mut CurrentSpan<'_, '_, '_>,
+                            alloc_id,
+                            base_offset,
+                            orig_tag|
+         -> InterpResult<'tcx> {
+            let extra = this.get_alloc_extra(alloc_id)?;
+            let stacked_borrows =
+                extra.stacked_borrows.as_ref().expect("we should have Stacked Borrows data");
+            let mut alloc_history = stacked_borrows.history.borrow_mut();
+            alloc_history.log_creation(
+                Some(orig_tag),
+                new_tag,
+                alloc_range(base_offset, size),
+                current_span,
+            );
+            if protect {
+                alloc_history.log_protector(orig_tag, new_tag, current_span);
+            }
+            Ok(())
+        };
+
         if size == Size::ZERO {
             // Don't update any stacks for a zero-sized access; borrow stacks are per-byte and this
             // touches no bytes so there is no stack to put this tag in.
@@ -714,16 +738,7 @@ fn reborrow(
             // Dangling slices are a common case here; it's valid to get their length but with raw
             // pointer tagging for example all calls to get_unchecked on them are invalid.
             if let Ok((alloc_id, base_offset, orig_tag)) = this.ptr_try_get_alloc_id(place.ptr) {
-                let extra = this.get_alloc_extra(alloc_id)?;
-                let stacked_borrows =
-                    extra.stacked_borrows.as_ref().expect("we should have Stacked Borrows data");
-                let mut alloc_history = stacked_borrows.history.borrow_mut();
-                alloc_history.log_creation(
-                    Some(orig_tag),
-                    new_tag,
-                    alloc_range(base_offset, Size::ZERO),
-                    &mut this.machine.current_span(),
-                );
+                log_creation(this, current_span, alloc_id, base_offset, orig_tag)?;
             }
 
             trace!(
@@ -736,23 +751,7 @@ fn reborrow(
             return Ok(());
         }
         let (alloc_id, base_offset, orig_tag) = this.ptr_get_alloc_id(place.ptr)?;
-
-        let mut current_span = this.machine.current_span();
-        {
-            let extra = this.get_alloc_extra(alloc_id)?;
-            let stacked_borrows =
-                extra.stacked_borrows.as_ref().expect("we should have Stacked Borrows data");
-            let mut alloc_history = stacked_borrows.history.borrow_mut();
-            alloc_history.log_creation(
-                Some(orig_tag),
-                new_tag,
-                alloc_range(base_offset, size),
-                &mut current_span,
-            );
-            if protect {
-                alloc_history.log_protector(orig_tag, new_tag, &mut current_span);
-            }
-        }
+        log_creation(this, current_span, alloc_id, base_offset, orig_tag)?;
 
         // Ensure we bail out if the pointer goes out-of-bounds (see miri#1050).
         let (alloc_size, _) =
@@ -819,7 +818,7 @@ fn reborrow(
                             item,
                             (alloc_id, range, offset),
                             &mut *global,
-                            &mut current_span,
+                            current_span,
                             history,
                         )
                     })
@@ -836,14 +835,14 @@ fn reborrow(
         let item = Item { perm, tag: new_tag, protector };
         let range = alloc_range(base_offset, size);
         let mut global = machine.stacked_borrows.as_ref().unwrap().borrow_mut();
-        let mut current_span = machine.current_span();
+        let current_span = &mut machine.current_span(); // `get_alloc_extra_mut` invalidated our old `current_span`
         stacked_borrows.for_each_mut(range, |offset, stack, history| {
             stack.grant(
                 orig_tag,
                 item,
                 (alloc_id, range, offset),
                 &mut global,
-                &mut current_span,
+                current_span,
                 history,
             )
         })?;

From 62c48b29987cd0e01d0140fcd01185fd02a57795 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 31 May 2022 08:44:48 -0400
Subject: [PATCH 2/2] fix some lifetime names

---
 src/helpers.rs         | 6 +++---
 src/stacked_borrows.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/helpers.rs b/src/helpers.rs
index 5a76e15465c..d9a7edcc113 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -810,12 +810,12 @@ pub fn current_span(&self) -> CurrentSpan<'_, 'mir, 'tcx> {
 /// topmost frame which corresponds to a local crate, and returns the current span in that frame.
 /// The result of that search is cached so that later calls are approximately free.
 #[derive(Clone)]
-pub struct CurrentSpan<'a, 'tcx, 'mir> {
+pub struct CurrentSpan<'a, 'mir, 'tcx> {
     span: Option<Span>,
-    machine: &'a Evaluator<'tcx, 'mir>,
+    machine: &'a Evaluator<'mir, 'tcx>,
 }
 
-impl<'a, 'tcx, 'mir> CurrentSpan<'a, 'tcx, 'mir> {
+impl<'a, 'mir, 'tcx> CurrentSpan<'a, 'mir, 'tcx> {
     pub fn get(&mut self) -> Span {
         *self.span.get_or_insert_with(|| Self::current_span(&self.machine))
     }
diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index e2e63f8a52a..6cb71f43118 100644
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -708,7 +708,7 @@ fn reborrow(
         let current_span = &mut this.machine.current_span();
 
         let log_creation = |this: &MiriEvalContext<'mir, 'tcx>,
-                            current_span: &mut CurrentSpan<'_, '_, '_>,
+                            current_span: &mut CurrentSpan<'_, 'mir, 'tcx>,
                             alloc_id,
                             base_offset,
                             orig_tag|