---

yaml
---
r: 12219
b: refs/heads/master
c: 5747fe7
h: refs/heads/master
i:
  12217: 803f192
  12215: 92a5dbf
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7f9ed39040404c59131ba3818e1ca947fb23d282
+refs/heads/master: 5747fe7a2c0df47da1e062e81988707d9209bb7e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_task.cpp

@@ -96,12 +96,6 @@ cleanup_task(cleanup_args *args) {
     bool threw_exception = args->threw_exception;
     rust_task *task = a->task;
 
-    cc::do_cc(task);
-    annihilate_boxes(task);
-    cc::do_final_cc(task);
-
-    task->die();
-
     {
         scoped_lock with(task->kill_lock);
         if (task->killed && !threw_exception) {
@@ -110,6 +104,20 @@ cleanup_task(cleanup_args *args) {
         }
     }
 
+    // FIXME: For performance we should do the annihilator instead
+    // of the cycle collector even under normal termination, but
+    // since that would hide memory management errors (like not derefing
+    // boxes), it needs to be disableable in debug builds.
+    if (threw_exception) {
+        // FIXME: When the annihilator is more powerful and successfully
+        // runs resource destructors, etc. we can get rid of this cc
+        cc::do_cc(task);
+        annihilate_boxes(task);
+    }
+    cc::do_final_cc(task);
+
+    task->die();
+
     task->notify(!threw_exception);
 
     if (threw_exception) {