---

yaml
---
r: 14595
b: refs/heads/try
c: 1430675
h: refs/heads/master
i:
  14593: 092b430
  14591: b754f0a
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: 9ec94f714ab4d7175451095dc7438e6a9ee2cc0c
+refs/heads/try: 14306756b4a4f5f83043e3c2f91169a151fd54f5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -121,13 +121,6 @@ rust_task::delete_this()
     I(thread, ref_count == 0); // ||
     //   (ref_count == 1 && this == sched->root_task));
 
-    // Delete all the stacks. There may be more than one if the task failed
-    // and no landing pads stopped to clean up.
-    // FIXME: We should do this when the task exits, not in the destructor
-    while (stk != NULL) {
-        del_stack();
-    }
-
     thread->release_task(this);
 }
 
@@ -725,6 +718,16 @@ rust_task::check_stack_canary() {
     ::check_stack_canary(stk);
 }
 
+void
+rust_task::delete_all_stacks() {
+    I(thread, !on_rust_stack());
+    // Delete all the stacks. There may be more than one if the task failed
+    // and no landing pads stopped to clean up.
+    while (stk != NULL) {
+        del_stack();
+    }
+}
+
 void
 rust_task::config_notify(chan_handle chan) {
     notify_enabled = true;

branches/try/src/rt/rust_task.h

@@ -205,6 +205,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void reset_stack_limit();
     bool on_rust_stack();
     void check_stack_canary();
+    void delete_all_stacks();
 
     void config_notify(chan_handle chan);
 

branches/try/src/rt/rust_task_thread.cpp

@@ -144,6 +144,7 @@ rust_task_thread::reap_dead_tasks() {
         rust_task *task = dead_tasks_copy[i];
         // Release the task from the kernel so nobody else can get at it
         kernel->release_task_id(task->id);
+        task->delete_all_stacks();
         // Deref the task, which may cause it to request us to release it
         task->deref();
     }