From: Ralf Jung <post@ralfj.de>
Date: Wed, 11 Mar 2020 19:05:44 +0000 (+0100)
Subject: rustup+fix
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=45d5a37787accac8bd4276ea47872a561069109c;p=rust.git

rustup+fix
---

diff --git a/rust-version b/rust-version
index fb138448f9f..66d096c0a02 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-303d8aff6092709edd4dbd35b1c88e9aa40bf6d8
+c20d7eecbc0928b57da8fe30b2ef8528e2bdd5be
diff --git a/src/machine.rs b/src/machine.rs
index f69606e48f5..bd5884786c0 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -265,11 +265,10 @@ fn call_intrinsic(
     #[inline(always)]
     fn assert_panic(
         ecx: &mut InterpCx<'mir, 'tcx, Self>,
-        span: Span,
         msg: &mir::AssertMessage<'tcx>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
-        ecx.assert_panic(span, msg, unwind)
+        ecx.assert_panic(msg, unwind)
     }
 
     #[inline(always)]
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
index 2968bd9b58d..d6f563deb0f 100644
--- a/src/shims/panic.rs
+++ b/src/shims/panic.rs
@@ -14,7 +14,6 @@
 use rustc::mir;
 use rustc::ty::{self, layout::LayoutOf};
 use rustc_target::spec::PanicStrategy;
-use rustc_span::source_map::Span;
 
 use crate::*;
 
@@ -176,7 +175,6 @@ fn start_panic(
 
     fn assert_panic(
         &mut self,
-        span: Span,
         msg: &mir::AssertMessage<'tcx>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
@@ -187,11 +185,9 @@ fn assert_panic(
             BoundsCheck { ref index, ref len } => {
                 // Forward to `panic_bounds_check` lang item.
 
-                // First arg: Caller location.
-                let location = this.alloc_caller_location_for_span(span);
-                // Second arg: index.
+                // First arg: index.
                 let index = this.read_scalar(this.eval_operand(index, None)?)?;
-                // Third arg: len.
+                // Second arg: len.
                 let len = this.read_scalar(this.eval_operand(len, None)?)?;
 
                 // Call the lang item.
@@ -199,7 +195,7 @@ fn assert_panic(
                 let panic_bounds_check = ty::Instance::mono(this.tcx.tcx, panic_bounds_check);
                 this.call_function(
                     panic_bounds_check,
-                    &[location.ptr.into(), index.into(), len.into()],
+                    &[index.into(), len.into()],
                     None,
                     StackPopCleanup::Goto { ret: None, unwind },
                 )?;