---

yaml
---
r: 14155
b: refs/heads/try
c: 889a783
h: refs/heads/master
i:
  14153: 53a733a
  14151: 27ae7e2
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: d39ea4774614f1db3366184f1e6ce30b7614d9ff
+refs/heads/try: 889a78349426f28d1db508729e1091bad7cf46ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -219,7 +219,6 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
     DLOG(thread, task, "sizeof(task) = %d (0x%x)", sizeof *this, sizeof *this);
 
     stk = new_stk(thread, this, init_stack_sz);
-    rust_sp = stk->end;
     if (supervisor) {
         supervisor->ref();
     }
@@ -336,7 +335,7 @@ rust_task::start(spawn_fn spawnee_fn,
 
     I(thread, stk->data != NULL);
 
-    char *sp = (char *)rust_sp;
+    char *sp = (char *)stk->end;
 
     sp -= sizeof(spawn_args);
 

branches/try/src/rt/rust_task.h

@@ -53,8 +53,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     bool notify_enabled;
     chan_handle notify_chan;
 
-    uintptr_t rust_sp;         // Saved sp when not running.
-
     context ctx;
     stk_seg *stk;
     uintptr_t runtime_sp;      // Runtime sp while task running.