nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc changes to abi.rs

Browse Source
This commit is contained in:
bjorn3 2018-09-08 11:20:15 +02:00
parent 17c92bbd78
commit feee8b2445
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/abi.rs
View File

@ -482,17 +482,17 @@ pub fn codegen_call<'a, 'tcx: 'a>(
let call_inst = match fn_ty.sty { let call_inst = match fn_ty.sty {
ty::FnDef(def_id, substs) => { ty::FnDef(def_id, substs) => {
let func_ref = fx.get_function_ref( let inst = Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs).unwrap();
Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs).unwrap(), let func_ref = fx.get_function_ref(inst);
);
fx.bcx.ins().call(func_ref, &call_args) fx.bcx.ins().call(func_ref, &call_args)
} }
_ => { ty::FnPtr(_) => {
let func = trans_operand(fx, func); let func = trans_operand(fx, func);
let func = func.load_value(fx); let func = func.load_value(fx);
let sig = fx.bcx.import_signature(cton_sig_from_fn_ty(fx.tcx, fn_ty)); let sig = fx.bcx.import_signature(cton_sig_from_fn_ty(fx.tcx, fn_ty));
fx.bcx.ins().call_indirect(sig, func, &call_args) fx.bcx.ins().call_indirect(sig, func, &call_args)
} }
_ => bug!("{:?}", fn_ty),
}; };
match output_pass_mode { match output_pass_mode {