---

yaml
---
r: 14189
b: refs/heads/try
c: 3406da4
h: refs/heads/master
i:
  14187: 337e9a5
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: c42492e6aa481a65e4919b5ab26f4b0936556fc0
+refs/heads/try: 3406da49d98c93b54c8497310d7a7aeb7e9991b0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_stack.cpp

@@ -8,6 +8,10 @@ register_valgrind_stack(stk_seg *stk) {
     stk->valgrind_id =
         VALGRIND_STACK_REGISTER(&stk->data[0],
                                 stk->end);
+}
+
+void
+prepare_valgrind_stack(stk_seg *stk) {
 #ifndef NVALGRIND
     // Establish that the stack is accessible.  This must be done when reusing
     // old stack segments, since the act of popping the stack previously

branches/try/src/rt/rust_stack.h

@@ -42,6 +42,9 @@ destroy_stack(T allocer, stk_seg *stk) {
 void
 register_valgrind_stack(stk_seg *stk);
 
+void
+prepare_valgrind_stack(stk_seg *stk);
+
 void
 deregister_valgrind_stack(stk_seg *stk);
 

branches/try/src/rt/rust_task.cpp

@@ -568,6 +568,7 @@ rust_task::new_stack(size_t requested_sz) {
             stk = stk->prev;
             A(thread, stk->prev == NULL, "Bogus stack ptr");
             register_valgrind_stack(stk);
+            prepare_valgrind_stack(stk);
             return;
         } else {
             LOG(this, mem, "existing stack is not big enough");
@@ -599,6 +600,7 @@ rust_task::new_stack(size_t requested_sz) {
 
     stk = new_stk;
     register_valgrind_stack(stk);
+    prepare_valgrind_stack(stk);
     total_stack_sz += user_stack_size(new_stk);
 }
 

branches/try/src/rt/rust_task_thread.cpp

@@ -373,6 +373,7 @@ rust_task_thread::prepare_c_stack() {
     if (!cached_c_stack) {
         cached_c_stack = create_stack(kernel, C_STACK_SIZE);
         register_valgrind_stack(cached_c_stack);
+        prepare_valgrind_stack(cached_c_stack);
     }
 }