From 759e1c165f474314bb113d0b72e8ef85fc3864d7 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 23 Oct 2012 13:48:09 -0700 Subject: [PATCH] rt: Remove unused string upcalls harder --- src/rt/rust_upcall.cpp | 31 ------------------------------- src/rt/rustrt.def.in | 2 -- 2 files changed, 33 deletions(-) diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 9c8c8462d88..afb62d52be7 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -311,37 +311,6 @@ upcall_validate_box(rust_opaque_box* ptr) { /**********************************************************************/ -struct s_str_new_uniq_args { - rust_task *task; - const char *cstr; - size_t len; - rust_str *retval; -}; - -extern "C" CDECL void -upcall_s_str_new_uniq(s_str_new_uniq_args *args) { - rust_task *task = args->task; - LOG_UPCALL_ENTRY(task); - args->retval = make_str(task->kernel, args->cstr, args->len, - "str_new_uniq"); -} - -extern "C" CDECL rust_str* -upcall_str_new_uniq(const char *cstr, size_t len) { - rust_task *task = rust_get_current_task(); - s_str_new_uniq_args args = { task, cstr, len, 0 }; - UPCALL_SWITCH_STACK(task, &args, upcall_s_str_new_uniq); - return args.retval; -} - -extern "C" CDECL rust_str* -upcall_str_new(const char *cstr, size_t len) { - rust_task *task = rust_get_current_task(); - s_str_new_uniq_args args = { task, cstr, len, 0 }; - UPCALL_SWITCH_STACK(task, &args, upcall_s_str_new_uniq); - return args.retval; -} - extern "C" _Unwind_Reason_Code __gxx_personality_v0(int version, _Unwind_Action actions, diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 06f02e758f8..1eedb8d5e28 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -79,8 +79,6 @@ upcall_validate_box upcall_log_type upcall_malloc upcall_rust_personality -upcall_str_new_uniq -upcall_str_new_shared upcall_call_shim_on_c_stack upcall_call_shim_on_rust_stack upcall_new_stack