Skip to content

Commit 0a3f460

Browse files
committed
Update panic machinery to match #[track_caller] changes.
This gets miri's tests passing again with rust-lang/rust#67137.
1 parent f3c267d commit 0a3f460

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/machine.rs

+1
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
182182
#[inline(always)]
183183
fn find_mir_or_eval_fn(
184184
ecx: &mut InterpCx<'mir, 'tcx, Self>,
185+
_span: Span,
185186
instance: ty::Instance<'tcx>,
186187
args: &[OpTy<'tcx, Tag>],
187188
ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,

src/shims/panic.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,12 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
187187
let msg = msg.description();
188188
let msg = this.allocate_str(msg, MiriMemoryKind::Env.into());
189189

190-
// Second arg: Caller location.
191-
let location = this.alloc_caller_location_for_span(span);
192-
193190
// Call the lang item.
194191
let panic = this.tcx.lang_items().panic_fn().unwrap();
195192
let panic = ty::Instance::mono(this.tcx.tcx, panic);
196193
this.call_function(
197194
panic,
198-
&[msg.to_ref(), location.ptr.into()],
195+
&[msg.to_ref()],
199196
None,
200197
StackPopCleanup::Goto { ret: None, unwind },
201198
)?;

0 commit comments

Comments
 (0)