---

yaml
---
r: 11180
b: refs/heads/master
c: fc028c3
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5fc2e9e9ab9cf0329fb9f18c28c2df545e4e3edc
+refs/heads/master: fc028c30a0570e097f4f16f9731c1433226e5367
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_stack.h

@@ -13,12 +13,16 @@ struct stk_seg {
     uint8_t data[];
 };
 
+void
+add_stack_canary(stk_seg *stk);
+
 template <class T>
 stk_seg *
 create_stack(T allocer, size_t sz) {
   size_t total_sz = sizeof(stk_seg) + sz;
   stk_seg *stk = (stk_seg *)allocer->malloc(total_sz, "stack");
   memset(stk, 0, sizeof(stk_seg));
+  add_stack_canary(stk);
   stk->end = (uintptr_t) &stk->data[sz];
   return stk;
 }
@@ -35,9 +39,6 @@ config_valgrind_stack(stk_seg *stk);
 void
 unconfig_valgrind_stack(stk_seg *stk);
 
-void
-add_stack_canary(stk_seg *stk);
-
 void
 check_stack_canary(stk_seg *stk);
 

trunk/src/rt/rust_task.cpp

@@ -593,7 +593,6 @@ rust_task::new_stack(size_t requested_sz) {
     size_t sz = rust_stk_sz + RED_ZONE_SIZE;
     stk_seg *new_stk = create_stack(this, sz);
     LOGPTR(thread, "new stk", (uintptr_t)new_stk);
-    add_stack_canary(new_stk);
     new_stk->prev = NULL;
     new_stk->next = stk;
     LOGPTR(thread, "stk end", new_stk->end);