diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 940cf3aa01a..fae3e7e2943 100644 --- a/src/rt/rust_upcall.cpp +++ b/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. */ diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 5cf6ee61773..6c83742a006 100644 --- a/src/rt/rustrt.def.in +++ b/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