diff options
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/trans.rs | 6 | ||||
| -rw-r--r-- | src/comp/middle/typeck.rs | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index ff67fb37257..e054d359bb9 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -5531,7 +5531,6 @@ 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_cdecl. | ast::native_abi_rust_intrinsic. | ast::native_abi_x86stdcall. { ret true; } ast::native_abi_c_stack_cdecl. | @@ -5576,11 +5575,6 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str, uses_retptr = true; cast_to_i32 = false; } - ast::native_abi_cdecl. { - pass_task = false; - uses_retptr = false; - cast_to_i32 = true; - } ast::native_abi_x86stdcall. { pass_task = false; uses_retptr = false; diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index be79474536d..7306ae41817 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -551,7 +551,8 @@ mod collect { alt it { some(ast_map::node_item(item)) { tpt = ty_of_item(cx, item); } some(ast_map::node_native_item(native_item)) { - tpt = ty_of_native_item(cx, native_item, ast::native_abi_cdecl); + tpt = ty_of_native_item(cx, native_item, + ast::native_abi_c_stack_cdecl); } _ { cx.tcx.sess.fatal("internal error " + std::int::str(id.node)); } } |