diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-02-08 21:18:23 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-02-09 19:00:15 -0800 |
| commit | 1e2fe4ab8f132e6e84568b050dfaaabdaeae0c43 (patch) | |
| tree | 5ba1dd1a4aebf7090906b7cec0063aff3aafe607 /src/rt/rust_upcall.cpp | |
| parent | 0667fb4e6342a6a18320b464316ae7ba9c2bc192 (diff) | |
| download | rust-1e2fe4ab8f132e6e84568b050dfaaabdaeae0c43.tar.gz rust-1e2fe4ab8f132e6e84568b050dfaaabdaeae0c43.zip | |
rt: Rename call_shim_on_c_stack to call_and_change_stacks
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index ea51ecc71c0..c66b4370713 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -48,7 +48,7 @@ call_upcall_on_c_stack(void *args, void *fn_ptr) { check_stack_alignment(); rust_task *task = rust_task_thread::get_task(); rust_task_thread *thread = task->thread; - thread->c_context.call_shim_on_c_stack(args, fn_ptr); + thread->c_context.call_and_change_stacks(args, fn_ptr); } extern "C" void record_sp(void *limit); @@ -71,7 +71,7 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) { rust_task_thread *thread = task->thread; try { - thread->c_context.call_shim_on_c_stack(args, fn_ptr); + thread->c_context.call_and_change_stacks(args, fn_ptr); } catch (...) { A(thread, false, "Native code threw an exception"); } |