diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-03-21 00:31:40 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-03-21 19:10:31 -0700 |
| commit | 8a145a601eb97f9d32572fed23030bc1bc319105 (patch) | |
| tree | 063c499965cdf2a0dcaaa599ff60d3d300acd5bd /src/rt/rust_upcall.cpp | |
| parent | 9ba712fb8b00eda702be71048cda748877111ea7 (diff) | |
| download | rust-8a145a601eb97f9d32572fed23030bc1bc319105.tar.gz rust-8a145a601eb97f9d32572fed23030bc1bc319105.zip | |
rt: Don't swatch stacks during upcall_del_stack
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 647e8edf3a8..b5885cd9def 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -461,17 +461,13 @@ upcall_new_stack(size_t stk_sz, void *args_addr, size_t args_sz) { return args.result; } +// NB: This needs to be blazing fast. Don't switch stacks extern "C" CDECL void -upcall_s_del_stack() { +upcall_del_stack() { rust_task *task = rust_task_thread::get_task(); task->prev_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 |