diff options
| author | Michael Sullivan <sully@msully.net> | 2011-06-14 15:54:58 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2011-06-14 16:09:21 -0700 |
| commit | ccd1bcf7a754a5437cd108bb6bb8a32848334fe6 (patch) | |
| tree | 84248a4197f80efa1f1a123602e99e730e0f8c5b /src | |
| parent | 5378f48a03296372cc29cc9e74bdad9491432600 (diff) | |
| download | rust-ccd1bcf7a754a5437cd108bb6bb8a32848334fe6.tar.gz rust-ccd1bcf7a754a5437cd108bb6bb8a32848334fe6.zip | |
Make tydesc glue functions use cdecl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/middle/trans.rs | 14 | ||||
| -rw-r--r-- | src/rt/rust_internal.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 02e981d4527..4d5be62b048 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -1971,7 +1971,7 @@ fn declare_generic_glue(&@local_ctxt cx, fn_nm = mangle_internal_name_by_seq(cx.ccx, "glue_" + name); } - auto llfn = decl_fastcall_fn(cx.ccx.llmod, fn_nm, llfnty); + auto llfn = decl_cdecl_fn(cx.ccx.llmod, fn_nm, llfnty); set_glue_inlining(cx, llfn, t); ret llfn; } @@ -3232,11 +3232,11 @@ fn call_tydesc_glue_full(&@block_ctxt cx, ValueRef v, auto llfnptr = cx.build.GEP(tydesc, [C_int(0), C_int(field)]); auto llfn = cx.build.Load(llfnptr); - cx.build.FastCall(llfn, [C_null(T_ptr(T_nil())), - cx.fcx.lltaskptr, - C_null(T_ptr(T_nil())), - lltydescs, - llrawptr]); + cx.build.Call(llfn, [C_null(T_ptr(T_nil())), + cx.fcx.lltaskptr, + C_null(T_ptr(T_nil())), + lltydescs, + llrawptr]); } fn call_tydesc_glue(&@block_ctxt cx, ValueRef v, @@ -3311,7 +3311,7 @@ fn call_cmp_glue(&@block_ctxt cx, llrawrhsptr, llop]; - r.bcx.build.FastCall(llfn, llargs); + r.bcx.build.Call(llfn, llargs); ret res(r.bcx, r.bcx.build.Load(llcmpresultptr)); } diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index 9426fec904a..5db1216c102 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -206,11 +206,11 @@ struct rust_timer { #include "rust_util.h" -typedef void FASTCALL (glue_fn)(void *, rust_task *, void *, - const type_desc **, void *); -typedef void FASTCALL (cmp_glue_fn)(void *, rust_task *, void *, - const type_desc **, - void *, void *, int8_t); +typedef void CDECL (glue_fn)(void *, rust_task *, void *, + const type_desc **, void *); +typedef void CDECL (cmp_glue_fn)(void *, rust_task *, void *, + const type_desc **, + void *, void *, int8_t); struct type_desc { |