Skip to content

Commit 21f9175

Browse files
committed
Don't panic on miri_print_borrow_state() under -Zmiri-disable-stacked-borrows.
1 parent dc9f4e8 commit 21f9175

File tree

1 file changed

+5
-1
lines changed
  • src/tools/miri/src/borrow_tracker

1 file changed

+5
-1
lines changed

src/tools/miri/src/borrow_tracker/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
346346

347347
fn print_borrow_state(&mut self, alloc_id: AllocId, show_unnamed: bool) -> InterpResult<'tcx> {
348348
let this = self.eval_context_mut();
349-
let method = this.machine.borrow_tracker.as_ref().unwrap().borrow().borrow_tracker_method;
349+
let Some(borrow_tracker) = &this.machine.borrow_tracker else {
350+
eprintln!("attempted to print borrow state, but no borrow state is being tracked");
351+
return Ok(());
352+
};
353+
let method = borrow_tracker.borrow().borrow_tracker_method;
350354
match method {
351355
BorrowTrackerMethod::StackedBorrows => this.print_stacks(alloc_id),
352356
BorrowTrackerMethod::TreeBorrows => this.print_tree(alloc_id, show_unnamed),

0 commit comments

Comments
 (0)