---

yaml
---
r: 38883
b: refs/heads/incoming
c: bc3f89e
h: refs/heads/master
i:
  38881: 3d8a3f6
  38879: 9a0cf68
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 449f4fbb07861c133f2b7f4797edbe9b6e238940
+refs/heads/incoming: bc3f89e92bfba43c193fbd928f1502209157431c
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/back/upcall.rs

@@ -9,20 +9,12 @@ use lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef};
 
 type upcalls =
     {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_rust_stack: ValueRef,
      rust_personality: ValueRef,
      reset_stack_limit: ValueRef};
 
 fn declare_upcalls(targ_cfg: @session::config,
-                   _tn: type_names,
-                   tydesc_type: TypeRef,
                    llmod: ModuleRef) -> @upcalls {
     fn decl(llmod: ModuleRef, prefix: ~str, name: ~str,
             tys: ~[TypeRef], rv: TypeRef) ->
@@ -42,23 +34,6 @@ fn declare_upcalls(targ_cfg: @session::config,
     return @{trace: dv(~"trace", ~[T_ptr(T_i8()),
                               T_ptr(T_i8()),
                               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:
               d(~"call_shim_on_c_stack",
                 // arguments: void *args, void *fn_ptr

branches/incoming/src/rustc/middle/trans/base.rs

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