---

yaml
---
r: 13690
b: refs/heads/master
c: d29e8fc
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8910b2ff7c6fcf6bfa2192ccdfe74d29fd91f581
+refs/heads/master: d29e8fc059417774d07f85b5d7f5b566715567c3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_upcall.cpp

@@ -177,15 +177,6 @@ upcall_exchange_malloc(type_desc *td, uintptr_t size) {
     return args.retval;
 }
 
-// FIXME (#2681): remove after snapshot (6/21/12)
-extern "C" CDECL uintptr_t
-upcall_exchange_malloc_dyn(type_desc *td, uintptr_t size) {
-    rust_task *task = rust_get_current_task();
-    s_exchange_malloc_args args = {task, 0, td, size};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_exchange_malloc);
-    return args.retval;
-}
-
 struct s_exchange_free_args {
     rust_task *task;
     void *ptr;
@@ -246,16 +237,6 @@ upcall_malloc(type_desc *td, uintptr_t size) {
     return args.retval;
 }
 
-// FIXME (#2681): remove after snapshot (6/21/12)
-extern "C" CDECL uintptr_t
-upcall_malloc_dyn(type_desc *td, uintptr_t size) {
-    rust_task *task = rust_get_current_task();
-    s_malloc_args args = {task, 0, td, size};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_malloc);
-    return args.retval;
-}
-
-
 /**********************************************************************
  * Called whenever an object in the task-local heap is freed.
  */

trunk/src/rt/rustrt.def.in

@@ -72,7 +72,6 @@ upcall_trace
 upcall_free
 upcall_validate_box
 upcall_log_type
-upcall_malloc
 upcall_malloc_dyn
 upcall_rust_personality
 upcall_vec_grow
@@ -85,7 +84,6 @@ upcall_call_shim_on_rust_stack
 upcall_new_stack
 upcall_del_stack
 upcall_reset_stack_limit
-upcall_exchange_malloc
 upcall_exchange_malloc_dyn
 upcall_exchange_free
 rust_uv_loop_new