From f599687f3fdb062a8ff2fe139cbe47249c5f29a1 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 30 Mar 2020 22:54:49 +0200
Subject: [PATCH] adjust for span not being passed around any more

---
 src/diagnostics.rs      | 2 +-
 src/helpers.rs          | 9 +--------
 src/machine.rs          | 6 ++----
 src/shims/intrinsics.rs | 4 +---
 src/shims/panic.rs      | 4 ++--
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/diagnostics.rs b/src/diagnostics.rs
index 8595551b6cb..9ff43402115 100644
--- a/src/diagnostics.rs
+++ b/src/diagnostics.rs
@@ -129,7 +129,7 @@ fn report_msg<'tcx, 'mir>(
         err.help(help);
     }
     // Add backtrace
-    let frames = ecx.generate_stacktrace(None);
+    let frames = ecx.generate_stacktrace();
     for (idx, frame_info) in frames.iter().enumerate() {
         let is_local = frame_info.instance.def_id().is_local();
         // No span for non-local frames and the first frame (which is the error site).
diff --git a/src/helpers.rs b/src/helpers.rs
index 568e9c925d5..827bf1f9dde 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -10,7 +10,6 @@
     List, TyCtxt,
 };
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX};
-use rustc_span::source_map::DUMMY_SP;
 
 use rand::RngCore;
 
@@ -170,13 +169,7 @@ fn call_function(
 
         // Push frame.
         let mir = &*this.load_mir(f.def, None)?;
-        let span = this
-            .stack()
-            .last()
-            .and_then(Frame::current_source_info)
-            .map(|si| si.span)
-            .unwrap_or(DUMMY_SP);
-        this.push_stack_frame(f, span, mir, dest, stack_pop)?;
+        this.push_stack_frame(f, mir, dest, stack_pop)?;
 
         // Initialize arguments.
         let mut callee_args = this.frame().body.args_iter();
diff --git a/src/machine.rs b/src/machine.rs
index 4b7f3a76569..61c9f71407b 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -18,7 +18,7 @@
     Ty,
 };
 use rustc_ast::attr;
-use rustc_span::{source_map::Span, symbol::{sym, Symbol}};
+use rustc_span::symbol::{sym, Symbol};
 
 use crate::*;
 
@@ -253,7 +253,6 @@ fn enforce_validity(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool {
     #[inline(always)]
     fn find_mir_or_eval_fn(
         ecx: &mut InterpCx<'mir, 'tcx, Self>,
-        _span: Span,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
@@ -276,13 +275,12 @@ fn call_extra_fn(
     #[inline(always)]
     fn call_intrinsic(
         ecx: &mut rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,
-        span: Span,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
-        ecx.call_intrinsic(span, instance, args, ret, unwind)
+        ecx.call_intrinsic(instance, args, ret, unwind)
     }
 
     #[inline(always)]
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index e0eb0df87c4..b7900bfaa5d 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -5,7 +5,6 @@
 use rustc_middle::ty;
 use rustc_middle::ty::layout::{Align, LayoutOf};
 use rustc_apfloat::Float;
-use rustc_span::source_map::Span;
 
 use crate::*;
 
@@ -13,14 +12,13 @@ impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tc
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
     fn call_intrinsic(
         &mut self,
-        span: Span,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
-        if this.emulate_intrinsic(span, instance, args, ret)? {
+        if this.emulate_intrinsic(instance, args, ret)? {
             return Ok(());
         }
         let substs = instance.substs;
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
index 77741b7cca4..3474945980a 100644
--- a/src/shims/panic.rs
+++ b/src/shims/panic.rs
@@ -51,7 +51,7 @@ fn handle_miri_start_panic(
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
 
-        trace!("miri_start_panic: {:?}", this.frame().span);
+        trace!("miri_start_panic: {:?}", this.frame().instance);
 
         // Get the raw pointer stored in arg[0] (the panic payload).
         let payload = this.read_scalar(args[0])?.not_undef()?;
@@ -133,7 +133,7 @@ fn handle_stack_pop(
         if let (true, Some(catch_unwind)) = (unwinding, extra.catch_unwind.take()) {
             // We've just popped a frame that was pushed by `try`,
             // and we are unwinding, so we should catch that.
-            trace!("unwinding: found catch_panic frame during unwinding: {:?}", this.frame().span);
+            trace!("unwinding: found catch_panic frame during unwinding: {:?}", this.frame().instance);
 
             // We set the return value of `try` to 1, since there was a panic.
             this.write_scalar(Scalar::from_i32(1), catch_unwind.dest)?;
-- 
2.44.0