---

yaml
---
r: 8176
b: refs/heads/snap-stage3
c: 8fe506b
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: ea76d3f454c53623fdd957b79a6652c7d1f2dcc8
+refs/heads/snap-stage3: 8fe506bdca714fe2b8b005b1d190091d221c4044
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_stack.h

@@ -17,7 +17,10 @@ template <class T>
 stk_seg *
 create_stack(T allocer, size_t sz) {
   size_t total_sz = sizeof(stk_seg) + sz;
-  return (stk_seg *)allocer->malloc(total_sz, "stack");
+  stk_seg *stk = (stk_seg *)allocer->malloc(total_sz, "stack");
+  memset(stk, 0, sizeof(stk_seg));
+  stk->end = (uintptr_t) &stk->data[sz];
+  return stk;
 }
 
 template <class T>

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

@@ -584,11 +584,9 @@ 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);
-    memset(new_stk, 0, sizeof(stk_seg));
     add_stack_canary(new_stk);
     new_stk->prev = NULL;
     new_stk->next = stk;
-    new_stk->end = (uintptr_t) &new_stk->data[rust_stk_sz + RED_ZONE_SIZE];
     LOGPTR(thread, "stk end", new_stk->end);
 
     stk = new_stk;