---

yaml
---
r: 11481
b: refs/heads/master
c: 5ee89f3
h: refs/heads/master
i:
  11479: 7167544
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: acb129c5412bdc4375bb3a31a192ea6e7f26ebcc
+refs/heads/master: 5ee89f3f2adbc1b087820f6b929d1dbd3057a507
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_cc.cpp

@@ -12,6 +12,7 @@
 #include <set>
 #include <vector>
 #include <stdint.h>
+#include <ios>
 
 // The number of allocations Rust code performs before performing cycle
 // collection.
@@ -20,6 +21,8 @@
 // defined in rust_upcall.cpp:
 void upcall_s_free_shared_type_desc(type_desc *td);
 
+using namespace std;
+
 namespace cc {
 
 // Internal reference count computation
@@ -659,6 +662,25 @@ do_cc(rust_task *task) {
     sweep::do_sweep(task, marked);
 }
 
+void
+do_final_cc(rust_task *task) {
+    do_cc(task);
+
+    boxed_region *boxed = &task->boxed;
+    for (rust_opaque_box *box = boxed->first_live_alloc();
+         box != NULL;
+         box = box->next) {
+        cerr << "Unreclaimed object found at " << (void*) box << ": ";
+        const type_desc *td = box->td;
+        shape::arena arena;
+        shape::type_param *params = shape::type_param::from_tydesc(td, arena);
+        shape::log log(task, true, td->shape, params, td->shape_tables,
+                       (uint8_t*)box_body(box), cerr);
+        log.walk();
+        cerr << "\n";
+    }
+}
+
 void
 maybe_cc(rust_task *task) {
     static debug::flag zeal("RUST_CC_ZEAL");

trunk/src/rt/rust_cc.h

@@ -9,6 +9,10 @@ struct rust_task;
 namespace cc {
 
 void do_cc(rust_task *task);
+
+// performs a cycle coll then asserts that there is nothing left
+void do_final_cc(rust_task *task);
+
 void maybe_cc(rust_task *task);
 
 }   // end namespace cc

trunk/src/rt/rust_task.cpp

@@ -149,7 +149,7 @@ cleanup_task(cleanup_args *args) {
     bool threw_exception = args->threw_exception;
     rust_task *task = a->task;
 
-    cc::do_cc(task);
+    cc::do_final_cc(task);
 
     task->die();