---

brson · brson · commit 385d3140d2bc · 2012-02-14T15:11:56.000-08:00
yaml --- r: 14300 b: refs/heads/try c: 859e025 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: b157f0b263fba5a1c7e8e80a744f6f22ff3c7276
+refs/heads/try: 859e0256524a1f19ca0c79f518d2bb396355f174
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rt/rust_task_thread.cpp b/branches/try/src/rt/rust_task_thread.cpp
@@ -371,7 +371,6 @@ rust_task_thread::prepare_c_stack(rust_task *task) {
     I(this, !extra_c_stack);
     if (!cached_c_stack && !task->have_c_stack()) {
         cached_c_stack = create_stack(kernel, C_STACK_SIZE);
-        prepare_valgrind_stack(cached_c_stack);
     }
 }
 
diff --git a/branches/try/src/rt/rust_task_thread.h b/branches/try/src/rt/rust_task_thread.h
@@ -189,6 +189,7 @@ rust_task_thread::borrow_c_stack() {
         your_stack = cached_c_stack;
         cached_c_stack = NULL;
     }
+    prepare_valgrind_stack(your_stack);
     return your_stack;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,6 @@ rust_task_thread::prepare_c_stack(rust_task *task) {`
`371`	`371`	`I(this, !extra_c_stack);`
`372`	`372`	`if (!cached_c_stack && !task->have_c_stack()) {`
`373`	`373`	`cached_c_stack = create_stack(kernel, C_STACK_SIZE);`
`374`		`- prepare_valgrind_stack(cached_c_stack);`
`375`	`374`	`}`
`376`	`375`	`}`
`377`	`376`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ rust_task_thread::borrow_c_stack() {`
`189`	`189`	`your_stack = cached_c_stack;`
`190`	`190`	`cached_c_stack = NULL;`
`191`	`191`	`}`
	`192`	`+ prepare_valgrind_stack(your_stack);`
`192`	`193`	`return your_stack;`
`193`	`194`	`}`
`194`	`195`