Skip to content

Commit 5b534e4

Browse files
committed
Use the correct calling convention for extern rust functions.
1 parent 50fb4be commit 5b534e4

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/librustc/middle/trans/foreign.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,19 @@ pub fn register_rust_fn_with_foreign_abi(ccx: @mut CrateContext,
399399

400400
let tys = foreign_types_for_id(ccx, node_id);
401401
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+
};
402410
let llfn = base::register_fn_llvmty(ccx,
403411
sp,
404412
sym,
405413
node_id,
406-
lib::llvm::CCallConv,
414+
cconv,
407415
llfn_ty);
408416
add_argument_attributes(&tys, llfn);
409417
debug!("register_rust_fn_with_foreign_abi(node_id={:?}, llfn_ty={}, llfn={})",

0 commit comments

Comments
 (0)