Skip to content

Commit 21fb14d

Browse files
committed
avoid printing the tag twice
1 parent 5569fff commit 21fb14d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/stacked_borrows.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ impl AllocationExtra<Tag> for Stacks {
497497
ptr: Pointer<Tag>,
498498
size: Size,
499499
) -> EvalResult<'tcx> {
500-
trace!("read access with tag {:?}: {:?}, size {}", ptr.tag, ptr, size.bytes());
500+
trace!("read access with tag {:?}: {:?}, size {}", ptr.tag, ptr.erase_tag(), size.bytes());
501501
alloc.extra.for_each(ptr, size, |stack, global| {
502502
stack.access(AccessKind::Read, ptr.tag, global)?;
503503
Ok(())
@@ -510,7 +510,7 @@ impl AllocationExtra<Tag> for Stacks {
510510
ptr: Pointer<Tag>,
511511
size: Size,
512512
) -> EvalResult<'tcx> {
513-
trace!("write access with tag {:?}: {:?}, size {}", ptr.tag, ptr, size.bytes());
513+
trace!("write access with tag {:?}: {:?}, size {}", ptr.tag, ptr.erase_tag(), size.bytes());
514514
alloc.extra.for_each(ptr, size, |stack, global| {
515515
stack.access(AccessKind::Write, ptr.tag, global)?;
516516
Ok(())
@@ -523,7 +523,7 @@ impl AllocationExtra<Tag> for Stacks {
523523
ptr: Pointer<Tag>,
524524
size: Size,
525525
) -> EvalResult<'tcx> {
526-
trace!("deallocation with tag {:?}: {:?}, size {}", ptr.tag, ptr, size.bytes());
526+
trace!("deallocation with tag {:?}: {:?}, size {}", ptr.tag, ptr.erase_tag(), size.bytes());
527527
alloc.extra.for_each(ptr, size, |stack, global| {
528528
stack.dealloc(ptr.tag, global)
529529
})
@@ -546,7 +546,7 @@ trait EvalContextPrivExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
546546
let protector = if protect { Some(this.frame().extra) } else { None };
547547
let ptr = place.ptr.to_ptr()?;
548548
trace!("reborrow: {} reference {:?} derived from {:?} (pointee {}): {:?}, size {}",
549-
kind, new_tag, ptr.tag, place.layout.ty, ptr, size.bytes());
549+
kind, new_tag, ptr.tag, place.layout.ty, ptr.erase_tag(), size.bytes());
550550

551551
// Get the allocation. It might not be mutable, so we cannot use `get_mut`.
552552
let alloc = this.memory().get(ptr.alloc_id)?;

0 commit comments

Comments
 (0)