diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-11-09 15:56:28 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-11-09 16:47:43 -0800 |
| commit | c7f0ca6063022e244ab6a2d4e85db1c13867b084 (patch) | |
| tree | 9fb79e009597948fea5565417d6372a11dba504e /src/comp/middle | |
| parent | dec6b53761f8157ea553db09b6d5ba40a433c9c4 (diff) | |
Remove native "x86stdcall" ABI
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/trans.rs | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 943914b65bf..1300528388e 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -5596,8 +5596,7 @@ fn native_fn_ty_param_count(cx: @crate_ctxt, id: ast::node_id) -> uint { pure fn native_abi_requires_pair(abi: ast::native_abi) -> bool { alt abi { - ast::native_abi_rust_intrinsic. | - ast::native_abi_x86stdcall. { ret true; } + ast::native_abi_rust_intrinsic. { ret true; } ast::native_abi_c_stack_cdecl. | ast::native_abi_c_stack_stdcall. { ret false; } } @@ -5631,6 +5630,8 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str, let fn_type = node_id_type(ccx, id); // NB: has no type params let abi = ty::ty_fn_abi(ccx.tcx, fn_type); + // FIXME: There's probably a lot of unused code here now that + // there's only one possible combination of these three options let pass_task; let uses_retptr; let cast_to_i32; @@ -5640,11 +5641,6 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str, uses_retptr = true; cast_to_i32 = false; } - ast::native_abi_x86stdcall. { - pass_task = false; - uses_retptr = false; - cast_to_i32 = true; - } ast::native_abi_c_stack_cdecl. { let llfn = decl_cdecl_fn(ccx.llmod, name, T_fn([], ccx.int_type)); ccx.item_ids.insert(id, llfn); @@ -5789,14 +5785,6 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str, r = result.val; rptr = result.rptr; } - ast::native_abi_x86stdcall. { - let result = - trans_simple_native_abi(bcx, name, call_args, fn_type, - uses_retptr, - lib::llvm::LLVMX86StdcallCallConv); - r = result.val; - rptr = result.rptr; - } _ { r = trans_native_call(new_raw_block_ctxt(bcx.fcx, bcx.llbb), |