rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Stop declaring unused upcalls

Browse Source
This commit is contained in:
Brian Anderson
2012-11-05 12:36:53 -08:00
parent 449f4fbb07
commit bc3f89e92b
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rustc/back/upcall.rs
View File

@@ -9,20 +9,12 @@ use lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef};
type upcalls = type upcalls =
{trace: ValueRef, {trace: ValueRef,
malloc: ValueRef,
free: ValueRef,
exchange_malloc: ValueRef,
exchange_free: ValueRef,
validate_box: ValueRef,
log_type: ValueRef,
call_shim_on_c_stack: ValueRef, call_shim_on_c_stack: ValueRef,
call_shim_on_rust_stack: ValueRef, call_shim_on_rust_stack: ValueRef,
rust_personality: ValueRef, rust_personality: ValueRef,
reset_stack_limit: ValueRef}; reset_stack_limit: ValueRef};
fn declare_upcalls(targ_cfg: @session::config, fn declare_upcalls(targ_cfg: @session::config,
_tn: type_names,
tydesc_type: TypeRef,
llmod: ModuleRef) -> @upcalls { llmod: ModuleRef) -> @upcalls {
fn decl(llmod: ModuleRef, prefix: ~str, name: ~str, fn decl(llmod: ModuleRef, prefix: ~str, name: ~str,
tys: ~[TypeRef], rv: TypeRef) -> tys: ~[TypeRef], rv: TypeRef) ->
@@ -42,23 +34,6 @@ fn declare_upcalls(targ_cfg: @session::config,
return @{trace: dv(~"trace", ~[T_ptr(T_i8()), return @{trace: dv(~"trace", ~[T_ptr(T_i8()),
T_ptr(T_i8()), T_ptr(T_i8()),
int_t]), int_t]),
malloc:
nothrow(d(~"malloc",
~[T_ptr(tydesc_type), int_t],
T_ptr(T_i8()))),
free:
nothrow(dv(~"free", ~[T_ptr(T_i8())])),
exchange_malloc:
nothrow(d(~"exchange_malloc",
~[T_ptr(tydesc_type), int_t],
T_ptr(T_i8()))),
exchange_free:
nothrow(dv(~"exchange_free", ~[T_ptr(T_i8())])),
validate_box:
nothrow(dv(~"validate_box", ~[T_ptr(T_i8())])),
log_type:
dv(~"log_type", ~[T_ptr(tydesc_type),
T_ptr(T_i8()), T_i32()]),
call_shim_on_c_stack: call_shim_on_c_stack:
d(~"call_shim_on_c_stack", d(~"call_shim_on_c_stack",
// arguments: void *args, void *fn_ptr // arguments: void *args, void *fn_ptr

3
src/rustc/middle/trans/base.rs
View File

@@ -2711,8 +2711,7 @@ fn trans_crate(sess: session::Session,
llvm_insns: HashMap(), llvm_insns: HashMap(),
fn_times: @mut ~[]}, fn_times: @mut ~[]},
upcalls: upcalls:
upcall::declare_upcalls(targ_cfg, tn, tydesc_type, upcall::declare_upcalls(targ_cfg, llmod),
llmod),
rtcalls: HashMap(), rtcalls: HashMap(),
tydesc_type: tydesc_type, tydesc_type: tydesc_type,
int_type: int_type, int_type: int_type,