alloc access tracking: print accessed range

Author: RalfJung

src/tools/miri/src/diagnostics.rs

@@ -128,7 +128,7 @@ pub enum NonHaltingDiagnostic {
     PoppedPointerTag(Item, String),
     TrackingAlloc(AllocId, Size, Align),
     FreedAlloc(AllocId),
-    AccessedAlloc(AllocId, AccessKind),
+    AccessedAlloc(AllocId, AllocRange, AccessKind),
     RejectedIsolatedOp(String),
     ProgressReport {
         block_count: u64, // how many basic blocks have been run so far
@@ -673,15 +673,15 @@ impl<'tcx> MiriMachine<'tcx> {
                     "created tag {tag:?} with {perm} at {alloc_id:?}{range:?} derived from {orig_tag:?}"
                 ),
             PoppedPointerTag(item, cause) => format!("popped tracked tag for item {item:?}{cause}"),
-            TrackingAlloc(AllocId(id), size, align) =>
+            TrackingAlloc(id, size, align) =>
                 format!(
-                    "now tracking allocation of {size} bytes (alignment {align} bytes) with id {id}",
+                    "now tracking allocation {id:?} of {size} bytes (alignment {align} bytes)",
                     size = size.bytes(),
                     align = align.bytes(),
                 ),
-            AccessedAlloc(AllocId(id), access_kind) =>
-                format!("{access_kind} to allocation with id {id}"),
-            FreedAlloc(AllocId(id)) => format!("freed allocation with id {id}"),
+            AccessedAlloc(id, range, access_kind) =>
+                format!("{access_kind} at {id:?}[{}..{}]", range.start.bytes(), range.end().bytes()),
+            FreedAlloc(id) => format!("freed allocation {id:?}"),
             RejectedIsolatedOp(op) => format!("{op} was made to return an error due to isolation"),
             ProgressReport { .. } =>
                 format!("progress report: current operation being executed is here"),

src/tools/miri/src/machine.rs

@@ -1523,8 +1523,11 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
         range: AllocRange,
     ) -> InterpResult<'tcx> {
         if machine.track_alloc_accesses && machine.tracked_alloc_ids.contains(&alloc_id) {
-            machine
-                .emit_diagnostic(NonHaltingDiagnostic::AccessedAlloc(alloc_id, AccessKind::Read));
+            machine.emit_diagnostic(NonHaltingDiagnostic::AccessedAlloc(
+                alloc_id,
+                range,
+                AccessKind::Read,
+            ));
         }
         // The order of checks is deliberate, to prefer reporting a data race over a borrow tracker error.
         match &machine.data_race {
@@ -1559,8 +1562,11 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
         range: AllocRange,
     ) -> InterpResult<'tcx> {
         if machine.track_alloc_accesses && machine.tracked_alloc_ids.contains(&alloc_id) {
-            machine
-                .emit_diagnostic(NonHaltingDiagnostic::AccessedAlloc(alloc_id, AccessKind::Write));
+            machine.emit_diagnostic(NonHaltingDiagnostic::AccessedAlloc(
+                alloc_id,
+                range,
+                AccessKind::Write,
+            ));
         }
         match &machine.data_race {
             GlobalDataRaceHandler::None => {}

src/tools/miri/tests/pass/alloc-access-tracking.stderr

@@ -1,4 +1,4 @@
-note: now tracking allocation of 123 bytes (alignment ALIGN bytes) with id $ALLOC
+note: now tracking allocation ALLOC of 123 bytes (alignment ALIGN bytes)
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
 LL |         utils::miri_track_alloc(ptr);
@@ -7,7 +7,7 @@ LL |         utils::miri_track_alloc(ptr);
    = note: BACKTRACE:
    = note: inside `main` at tests/pass/alloc-access-tracking.rs:LL:CC
 
-note: write access to allocation with id $ALLOC
+note: write access at ALLOC[0..1]
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
 LL |         *ptr = 42; // Crucially, only a write is printed here, no read!
@@ -16,7 +16,7 @@ LL |         *ptr = 42; // Crucially, only a write is printed here, no read!
    = note: BACKTRACE:
    = note: inside `main` at tests/pass/alloc-access-tracking.rs:LL:CC
 
-note: read access to allocation with id $ALLOC
+note: read access at ALLOC[0..1]
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
 LL |         assert_eq!(*ptr, 42);
@@ -26,7 +26,7 @@ LL |         assert_eq!(*ptr, 42);
    = note: inside `main` at RUSTLIB/core/src/macros/mod.rs:LL:CC
    = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-note: freed allocation with id $ALLOC
+note: freed allocation ALLOC
   --> RUSTLIB/alloc/src/boxed.rs:LL:CC
    |
 LL |                 self.1.deallocate(From::from(ptr.cast()), layout);