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

Remove fn_ty argument from call_intrinsic for now.

Browse source
This commit is contained in:
Scott Olson 2016-03-17 06:04:24 -06:00
parent 36dfde50f4
commit 961137c018
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/interpreter.rs
View file

@ -247,13 +247,10 @@ impl<'a, 'tcx: 'a, 'arena> Interpreter<'a, 'tcx, 'arena> {
use syntax::abi::Abi;
match fn_ty.abi {
Abi::RustIntrinsic =>
try!(self.call_intrinsic(
&self.tcx.item_name(def_id).as_str(),
fn_ty,
substs,
args,
)),
Abi::RustIntrinsic => {
let name = self.tcx.item_name(def_id).as_str();
try!(self.call_intrinsic(&name, substs, args))
}
Abi::Rust => {
// Only trait methods can have a Self parameter.
@ -288,8 +285,8 @@ impl<'a, 'tcx: 'a, 'arena> Interpreter<'a, 'tcx, 'arena> {
Ok(target)
}
fn call_intrinsic(&mut self, name: &str, _fn_ty: &'tcx ty::BareFnTy<'tcx>,
substs: &'tcx Substs<'tcx>, args: &[mir::Operand<'tcx>]) -> EvalResult<TerminatorTarget>
fn call_intrinsic(&mut self, name: &str, substs: &'tcx Substs<'tcx>,
args: &[mir::Operand<'tcx>]) -> EvalResult<TerminatorTarget>
{
let ret_ptr = &mir::Lvalue::ReturnPointer;
let dest = try!(self.eval_lvalue(ret_ptr));