From 2671cf34a58b11f995add8402e75c1cd94ed051e Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 15 Dec 2017 10:14:02 +0100 Subject: [PATCH] Update to some cleanups in rustc --- miri/fn_call.rs | 2 +- miri/lib.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/miri/fn_call.rs b/miri/fn_call.rs index 71da97b5ab9b..3ca71e9b90c2 100644 --- a/miri/fn_call.rs +++ b/miri/fn_call.rs @@ -385,7 +385,7 @@ impl<'a, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'tcx, super::Evaluator<' // compute global if not cached let val = match self.tcx.interpret_interner.borrow().get_cached(cid) { Some(ptr) => ptr, - None => eval_body(self.tcx, instance, ty::ParamEnv::empty(traits::Reveal::All)).0?.0, + None => eval_body(self.tcx, instance, ty::ParamEnv::empty(traits::Reveal::All))?.0, }; let val = self.value_to_primval(ValTy { value: Value::ByRef(val), ty: args[0].ty })?.to_u64()?; if val == name { diff --git a/miri/lib.rs b/miri/lib.rs index 739ccfbf7671..fc282104e116 100644 --- a/miri/lib.rs +++ b/miri/lib.rs @@ -20,6 +20,7 @@ extern crate lazy_static; use rustc::ty::{self, TyCtxt}; use rustc::ty::layout::{TyLayout, LayoutOf}; use rustc::hir::def_id::DefId; +use rustc::ty::subst::Substs; use rustc::mir; use rustc::traits; @@ -157,7 +158,7 @@ pub fn eval_main<'a, 'tcx: 'a>( Ok(()) } - let mut ecx = EvalContext::new(tcx, ty::ParamEnv::empty(traits::Reveal::All), limits, Default::default(), Default::default()); + let mut ecx = EvalContext::new(tcx, ty::ParamEnv::empty(traits::Reveal::All), limits, Default::default(), Default::default(), Substs::empty()); match run_main(&mut ecx, main_id, start_wrapper) { Ok(()) => { let leaks = ecx.memory().leak_report();