---

yaml
---
r: 6535
b: refs/heads/master
c: 6da1a3f
h: refs/heads/master
i:
  6533: 40bb272
  6531: 4c06d20
  6527: 014babc
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1fd7d49a773d5b5921a659d9c1222b662b991d5
+refs/heads/master: 6da1a3fcd6b8996a8fde2dd80a93a3a3008a9659

trunk/src/rt/rust_scheduler.cpp

@@ -367,14 +367,11 @@ rust_scheduler::init_tls() {
     tls_initialized = true;
 }
 
-extern "C" CDECL void
-record_sp(void *limit);
-
 void
 rust_scheduler::place_task_in_tls(rust_task *task) {
     int result = pthread_setspecific(task_key, task);
     assert(!result && "Couldn't place the task in TLS!");
-    record_sp(task->stk->data + RED_ZONE_SIZE);
+    task->record_stack_limit();
 }
 
 rust_task *

trunk/src/rt/rust_task.cpp

@@ -576,16 +576,20 @@ rust_task::new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
     new_sp = align_down(new_sp - (args_sz + sizeof_retaddr));
     new_sp += sizeof_retaddr;
     memcpy(new_sp, args_addr, args_sz);
-    record_sp(stk_seg->data + RED_ZONE_SIZE);
+    record_stack_limit();
     return new_sp;
 }
 
 void
 rust_task::del_stack() {
     del_stk(this, stk);
-    record_sp(stk->data + RED_ZONE_SIZE);
+    record_stack_limit();
 }
 
+void
+rust_task::record_stack_limit() {
+    record_sp(stk->data + RED_ZONE_SIZE);
+}
 //
 // Local Variables:
 // mode: C++

trunk/src/rt/rust_task.h

@@ -199,6 +199,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
 
     void *new_stack(size_t stk_sz, void *args_addr, size_t args_sz);
     void del_stack();
+    void record_stack_limit();
 };
 
 //