about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-12-19 15:17:49 -0800
committerBrian Anderson <banderson@mozilla.com>2011-12-19 16:24:10 -0800
commitbedcaad97eaeb5ae09c2782a76d92749ac5585c4 (patch)
treec384bfb5cfbac0f3d559d9185e7a788ded09d12a /src/rt/rust_upcall.cpp
parent55a2fd18ec8f2e9aeee699296b7a500b49ff0c5e (diff)
downloadrust-bedcaad97eaeb5ae09c2782a76d92749ac5585c4.tar.gz
rust-bedcaad97eaeb5ae09c2782a76d92749ac5585c4.zip
rt: Give upcall_del_stack the same convention as other upcalls
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 5febc5098a2..981ce0ffb7e 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -614,13 +614,17 @@ upcall_new_stack(struct rust_new_stack2_args *args) {
                                       args->args_sz);
 }
 
-// FIXME: As above
 extern "C" CDECL void
-upcall_del_stack() {
+upcall_s_del_stack() {
     rust_task *task = rust_scheduler::get_task();
     task->del_stack();
 }
 
+extern "C" CDECL void
+upcall_del_stack() {
+    UPCALL_SWITCH_STACK(NULL, upcall_s_del_stack);
+}
+
 // Landing pads need to call this to insert the
 // correct limit into TLS.
 // NB: This must run on the Rust stack because it