File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed
src/librustc/middle/trans Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -399,11 +399,19 @@ pub fn register_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
399
399
400
400
let tys = foreign_types_for_id ( ccx, node_id) ;
401
401
let llfn_ty = lltype_for_fn_from_foreign_types ( & tys) ;
402
+ let t = ty:: node_id_to_type ( ccx. tcx , node_id) ;
403
+ let cconv = match ty:: get ( t) . sty {
404
+ ty:: ty_bare_fn( ref fn_ty) => {
405
+ let c = llvm_calling_convention ( ccx, fn_ty. abis ) ;
406
+ c. unwrap_or ( lib:: llvm:: CCallConv )
407
+ }
408
+ _ => lib:: llvm:: CCallConv
409
+ } ;
402
410
let llfn = base:: register_fn_llvmty ( ccx,
403
411
sp,
404
412
sym,
405
413
node_id,
406
- lib :: llvm :: CCallConv ,
414
+ cconv ,
407
415
llfn_ty) ;
408
416
add_argument_attributes ( & tys, llfn) ;
409
417
debug ! ( "register_rust_fn_with_foreign_abi(node_id={:?}, llfn_ty={}, llfn={})" ,
You can’t perform that action at this time.
0 commit comments