---

yaml
---
r: 30232
b: refs/heads/incoming
c: f022f56
h: refs/heads/master
v: v3

Author: Elliott Slaughter

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: f8323ac6156fd3234a94351a4104a1203bd83df1
+refs/heads/incoming: f022f566a437819d5b41903fa0c59471cd3c7491
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rt/rust_box_annihilator.cpp

@@ -197,7 +197,13 @@ annihilator::do_annihilate(rust_task *task, rust_opaque_box *box) {
     annihilator annihilator(task, true, tydesc->shape,
                             tydesc->shape_tables, p);
     annihilator.walk();
-    task->boxed.free(box);
+    // NB: A reference count of -1 indicates that this box lives on the
+    // exchange heap. Otherwise it lives on the task-local heap.
+    if (box->ref_count + 1 == 0) {
+        task->kernel->free(box);
+    } else {
+        task->boxed.free(box);
+    }
 }
 
 void