diff options
| author | Michael Sullivan <sully@msully.net> | 2012-06-21 10:47:27 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2012-06-21 10:47:45 -0700 |
| commit | 393f739990240914a6b147d6b642adc7ab9a939b (patch) | |
| tree | 074c2235a09418f23c875f6393f6b41b9497dd17 /src/rustc | |
| parent | 9a2b60dfce3ababb59eac53b7da083d7bd087e1d (diff) | |
| download | rust-393f739990240914a6b147d6b642adc7ab9a939b.tar.gz rust-393f739990240914a6b147d6b642adc7ab9a939b.zip | |
Rename upcall_malloc_dyn to just upcall_malloc.
Diffstat (limited to 'src/rustc')
| -rw-r--r-- | src/rustc/back/upcall.rs | 12 | ||||
| -rw-r--r-- | src/rustc/middle/trans/base.rs | 4 | ||||
| -rw-r--r-- | src/rustc/middle/trans/closure.rs | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/rustc/back/upcall.rs b/src/rustc/back/upcall.rs index e6a61a1d078..2cae381431d 100644 --- a/src/rustc/back/upcall.rs +++ b/src/rustc/back/upcall.rs @@ -10,9 +10,9 @@ import lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef}; type upcalls = {_fail: ValueRef, trace: ValueRef, - malloc_dyn: ValueRef, + malloc: ValueRef, free: ValueRef, - exchange_malloc_dyn: ValueRef, + exchange_malloc: ValueRef, exchange_free: ValueRef, validate_box: ValueRef, mark: ValueRef, @@ -55,14 +55,14 @@ fn declare_upcalls(targ_cfg: @session::config, trace: dv("trace", [T_ptr(T_i8()), T_ptr(T_i8()), int_t]), - malloc_dyn: - nothrow(d("malloc_dyn", + malloc: + nothrow(d("malloc", [T_ptr(tydesc_type), int_t], T_ptr(T_i8()))), free: nothrow(dv("free", [T_ptr(T_i8())])), - exchange_malloc_dyn: - nothrow(d("exchange_malloc_dyn", + exchange_malloc: + nothrow(d("exchange_malloc", [T_ptr(tydesc_type), int_t], T_ptr(T_i8()))), exchange_free: diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index c3ab41636a8..b2c02c909c7 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -356,9 +356,9 @@ fn malloc_raw_dyn(bcx: block, t: ty::t, heap: heap, let ccx = bcx.ccx(); let (mk_fn, upcall) = alt heap { - heap_shared { (ty::mk_imm_box, ccx.upcalls.malloc_dyn) } + heap_shared { (ty::mk_imm_box, ccx.upcalls.malloc) } heap_exchange { - (ty::mk_imm_uniq, ccx.upcalls.exchange_malloc_dyn ) + (ty::mk_imm_uniq, ccx.upcalls.exchange_malloc ) } }; diff --git a/src/rustc/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs index fd66b34c816..745c25f6f79 100644 --- a/src/rustc/middle/trans/closure.rs +++ b/src/rustc/middle/trans/closure.rs @@ -545,7 +545,7 @@ fn make_opaque_cbox_take_glue( let sz = Add(bcx, sz, shape::llsize_of(ccx, T_box_header(ccx))); // Allocate memory, update original ptr, and copy existing data - let malloc = ccx.upcalls.exchange_malloc_dyn; + let malloc = ccx.upcalls.exchange_malloc; let cbox_out = Call(bcx, malloc, [tydesc, sz]); let cbox_out = PointerCast(bcx, cbox_out, llopaquecboxty); call_memmove(bcx, cbox_out, cbox_in, sz); |