mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1451 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup
This commit is contained in:
bors 2020-06-15 15:39:08 +00:00
commit 146ee66268
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
4fb54ed484e2239a3e9eff3be17df00d2a162be3 ff4a2533a0720f9cdd86e02eafa3725f07aa7752

4
src/eval.rs
View File

@ -63,11 +63,11 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
main_id: DefId, main_id: DefId,
config: MiriConfig, config: MiriConfig,
) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Tag>)> { ) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Tag>)> {
let tcx_at = tcx.at(rustc_span::source_map::DUMMY_SP);
let param_env = ty::ParamEnv::reveal_all(); let param_env = ty::ParamEnv::reveal_all();
let layout_cx = LayoutCx { tcx, param_env }; let layout_cx = LayoutCx { tcx, param_env };
let mut ecx = InterpCx::new( let mut ecx = InterpCx::new(
tcx_at, tcx,
rustc_span::source_map::DUMMY_SP,
param_env, param_env,
Evaluator::new(config.communicate, config.validate, layout_cx), Evaluator::new(config.communicate, config.validate, layout_cx),
MemoryExtra::new( MemoryExtra::new(