user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustup+fix

Browse source
This commit is contained in:
Ralf Jung 2020-03-11 20:05:44 +01:00
parent 704228d0bb
commit 45d5a37787
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rust-version
View file

@ -1 +1 @@
303d8aff6092709edd4dbd35b1c88e9aa40bf6d8
c20d7eecbc0928b57da8fe30b2ef8528e2bdd5be

3
src/machine.rs
View file

@ -265,11 +265,10 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
#[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)]

10
src/shims/panic.rs
View file

@ -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 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
fn assert_panic(
&mut self,
span: Span,
msg: &mir::AssertMessage<'tcx>,
unwind: Option<mir::BasicBlock>,
) -> InterpResult<'tcx> {
@ -187,11 +185,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
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 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
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 },
)?;