From 62cf9abcf6611c598894e9a8abac6c54a72d862d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 15 Nov 2018 08:59:49 +0100
Subject: [PATCH] rename FrameInfo span field to call_site

---
 src/librustc/ich/impls_ty.rs               | 2 +-
 src/librustc/mir/interpret/error.rs        | 8 ++++----
 src/librustc_mir/interpret/eval_context.rs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index d8b207fa25aaf..f3b58ee5cf19b 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -388,7 +388,7 @@ impl_stable_hash_for!(enum mir::interpret::ErrorHandled {
 });
 
 impl_stable_hash_for!(struct mir::interpret::FrameInfo<'tcx> {
-    span,
+    call_site,
     lint_root,
     instance
 });
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index d375e62b27c58..8700f5d6e432f 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -57,7 +57,7 @@ pub struct ConstEvalErr<'tcx> {
 
 #[derive(Clone, Debug, RustcEncodable, RustcDecodable)]
 pub struct FrameInfo<'tcx> {
-    pub span: Span,
+    pub call_site: Span, // this span is in the caller!
     pub instance: ty::Instance<'tcx>,
     pub lint_root: Option<ast::NodeId>,
 }
@@ -72,8 +72,8 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
             } else {
                 write!(f, "inside call to `{}`", self.instance)?;
             }
-            if !self.span.is_dummy() {
-                let lo = tcx.sess.source_map().lookup_char_pos_adj(self.span.lo());
+            if !self.call_site.is_dummy() {
+                let lo = tcx.sess.source_map().lookup_char_pos_adj(self.call_site.lo());
                 write!(f, " at {}:{}:{}", lo.filename, lo.line, lo.col.to_usize() + 1)?;
             }
             Ok(())
@@ -159,7 +159,7 @@ impl<'a, 'gcx, 'tcx> ConstEvalErr<'tcx> {
         // on constant values.
         if self.stacktrace.len() > 0 {
             for frame_info in &self.stacktrace[..self.stacktrace.len()-1] {
-                err.span_label(frame_info.span, frame_info.to_string());
+                err.span_label(frame_info.call_site, frame_info.to_string());
             }
         }
         Ok(err)
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
index 279955fba17ad..dbda506d115af 100644
--- a/src/librustc_mir/interpret/eval_context.rs
+++ b/src/librustc_mir/interpret/eval_context.rs
@@ -679,7 +679,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
                 mir::ClearCrossCrate::Set(ref ivs) => Some(ivs[source_info.scope].lint_root),
                 mir::ClearCrossCrate::Clear => None,
             };
-            frames.push(FrameInfo { span, instance, lint_root });
+            frames.push(FrameInfo { call_site: span, instance, lint_root });
         }
         trace!("generate stacktrace: {:#?}, {:?}", frames, explicit_span);
         frames