From 1ba3028d8b7acb0c97859ea438f2beb4ccd364f9 Mon Sep 17 00:00:00 2001 From: Ben Blum Date: Wed, 27 Jun 2012 13:07:00 -0400 Subject: rt: Add task_local_data and related builtin calls (Closes #2680) --- src/rt/rust_upcall.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/rt/rust_upcall.cpp') diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 965d38fa70c..9ce22584793 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -49,19 +49,12 @@ extern "C" CDECL void upcall_call_shim_on_c_stack(void *args, void *fn_ptr) { rust_task *task = rust_get_current_task(); - // FIXME (#1226) - The shim functions generated by rustc contain the - // morestack prologue, so we need to let them know they have enough - // stack. - record_sp_limit(0); - try { task->call_on_c_stack(args, fn_ptr); } catch (...) { // Logging here is not reliable assert(false && "Foreign code threw an exception"); } - - task->record_stack_limit(); } /* @@ -72,11 +65,6 @@ extern "C" CDECL void upcall_call_shim_on_rust_stack(void *args, void *fn_ptr) { rust_task *task = rust_get_current_task(); - // FIXME (#2680): Because of the hack in the other function that disables - // the stack limit when entering the C stack, here we restore the stack - // limit again. - task->record_stack_limit(); - try { task->call_on_rust_stack(args, fn_ptr); } catch (...) { @@ -85,9 +73,6 @@ upcall_call_shim_on_rust_stack(void *args, void *fn_ptr) { // Logging here is not reliable assert(false && "Rust task failed after reentering the Rust stack"); } - - // FIXME (#2680): As above - record_sp_limit(0); } /**********************************************************************/ -- cgit 1.4.1-3-g733a5