---

yaml
---
r: 8184
b: refs/heads/snap-stage3
c: dff256c
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 81e1564a7d6097164ff914eb7e341f9fca42f1df
+refs/heads/snap-stage3: dff256cd198b6575f5194abb059c1798b7198f6f
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_task_thread.cpp

@@ -389,12 +389,14 @@ rust_task_thread::prepare_c_stack() {
     I(this, !extra_c_stack);
     if (!cached_c_stack) {
         cached_c_stack = create_stack(kernel, C_STACK_SIZE);
+        config_valgrind_stack(cached_c_stack);
     }
 }
 
 void
 rust_task_thread::unprepare_c_stack() {
     if (extra_c_stack) {
+        unconfig_valgrind_stack(extra_c_stack);
         destroy_stack(kernel, extra_c_stack);
         extra_c_stack = NULL;
     }
@@ -412,15 +414,13 @@ rust_task_thread::borrow_c_stack() {
         your_stack = cached_c_stack;
         cached_c_stack = NULL;
     }
-    config_valgrind_stack(your_stack);
     return your_stack;
 }
 
 // NB: Runs on the Rust stack
 void
 rust_task_thread::return_c_stack(stk_seg *stack) {
     I(this, !extra_c_stack);
-    unconfig_valgrind_stack(stack);
     if (!cached_c_stack) {
         cached_c_stack = stack;
     } else {