about summary refs log tree commit diff
path: root/src/rt/rust_task.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-02-08 18:04:14 -0800
committerBrian Anderson <banderson@mozilla.com>2012-02-09 19:00:15 -0800
commit4bd8f8d9368945fdbe42aecde2e5a68ac6fc42de (patch)
tree75a4a4cef3d4df16e99147c87afa5f944b2e5636 /src/rt/rust_task.cpp
parent889a78349426f28d1db508729e1091bad7cf46ea (diff)
downloadrust-4bd8f8d9368945fdbe42aecde2e5a68ac6fc42de.tar.gz
rust-4bd8f8d9368945fdbe42aecde2e5a68ac6fc42de.zip
rt: Rename new_stack to next_stack, del_stack to prev_stack
Diffstat (limited to 'src/rt/rust_task.cpp')
-rw-r--r--src/rt/rust_task.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index e5c20789760..fcf0da29e45 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -634,7 +634,7 @@ extern "C" CDECL void
 record_sp(void *limit);
 
 void *
-rust_task::new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
+rust_task::next_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
 
     stk_seg *stk_seg = new_stk(thread, this, stk_sz + args_sz);
     A(thread, stk_seg->end - (uintptr_t)stk_seg->data >= stk_sz + args_sz,
@@ -643,13 +643,17 @@ rust_task::new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
     // Push the function arguments to the new stack
     new_sp = align_down(new_sp - args_sz);
     memcpy(new_sp, args_addr, args_sz);
+    A(thread, rust_task_thread::get_task() == this,
+      "Recording the stack limit for the wrong thread");
     record_stack_limit();
     return new_sp;
 }
 
 void
-rust_task::del_stack() {
+rust_task::prev_stack() {
     del_stk(this, stk);
+    A(thread, rust_task_thread::get_task() == this,
+      "Recording the stack limit for the wrong thread");
     record_stack_limit();
 }