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

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

Browse Source 
rustup

Cc https://github.com/rust-lang/rust/issues/80907
This commit is contained in:
bors 2021-01-11 11:35:58 +00:00
commit 84d460bb4b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
8b002d5c3489a21db2c16e5af63cf5d234f6972c
a2cd91ceb0f156cb442d75e12dc77c3d064cdde4

3
src/machine.rs
View File

@ -24,6 +24,7 @@ use rustc_middle::{
use rustc_span::symbol::{sym, Symbol};
use rustc_span::def_id::DefId;
use rustc_target::abi::{LayoutOf, Size};
use rustc_target::spec::abi::Abi;
use crate::*;
@ -352,6 +353,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
fn find_mir_or_eval_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>,
instance: ty::Instance<'tcx>,
_abi: Abi,
args: &[OpTy<'tcx, Tag>],
ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
unwind: Option<mir::BasicBlock>,
@ -363,6 +365,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
fn call_extra_fn(
ecx: &mut InterpCx<'mir, 'tcx, Self>,
fn_val: Dlsym,
_abi: Abi,
args: &[OpTy<'tcx, Tag>],
ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
_unwind: Option<mir::BasicBlock>,