---

yaml
---
r: 12215
b: refs/heads/master
c: 3a7a408
h: refs/heads/master
i:
  12213: f3c6627
  12211: bc6305c
  12207: 98791b5
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 106c9faa59c1a605d7e0d67da5b45d24863ec009
+refs/heads/master: 3a7a408386b8b1fbeb82cf6d695a168296c02793
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/mk/rt.mk

@@ -67,6 +67,7 @@ RUNTIME_CS_$(1) := \
               rt/rust_abi.cpp \
               rt/rust_cc.cpp \
               rt/rust_debug.cpp \
+              rt/rust_box_annihilator.cpp \
               rt/memory_region.cpp \
               rt/boxed_region.cpp \
               rt/arch/$$(HOST_$(1))/context.cpp

trunk/src/rt/rust_box_annihilator.cpp

@@ -0,0 +1,15 @@
+#include "rust_internal.h"
+#include "rust_shape.h"
+
+void
+annihilate_boxes(rust_task *task) {
+    LOG(task, gc, "annihilating boxes for task %p", task);
+
+    boxed_region *boxed = &task->boxed;
+    rust_opaque_box *box = boxed->first_live_alloc();
+    while (box != NULL) {
+        rust_opaque_box *tmp = box;
+        box = box->next;
+        boxed->free(tmp);
+    }
+}

trunk/src/rt/rust_task.cpp

@@ -87,12 +87,17 @@ struct cleanup_args {
     bool threw_exception;
 };
 
+void
+annihilate_boxes(rust_task *task);
+
 void
 cleanup_task(cleanup_args *args) {
     spawn_args *a = args->spargs;
     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();