---

yaml
---
r: 72605
b: refs/heads/dist-snap
c: cc62680
h: refs/heads/master
i:
  72603: fe90823
v: v3

Author: nikomatsakis

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 4999d44d5b244671492fbdc05121416e05f729eb
+refs/heads/dist-snap: cc62680cc95d2ea733dbdc03c30e5c4c48fdad04
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/cleanup.rs

@@ -15,6 +15,7 @@ use ptr::mut_null;
 use repr::BoxRepr;
 use sys::TypeDesc;
 use cast::transmute;
+use unstable::lang::clear_task_borrow_list;
 
 #[cfg(notest)] use ptr::to_unsafe_ptr;
 
@@ -179,6 +180,10 @@ pub unsafe fn annihilate() {
         n_bytes_freed: 0
     };
 
+    // Quick hack: we need to free this list upon task exit, and this
+    // is a convenient place to do it.
+    clear_task_borrow_list();
+
     // Pass 1: Make all boxes immortal.
     //
     // In this pass, nothing gets freed, so it does not matter whether

branches/dist-snap/src/libcore/unstable/lang.rs

@@ -91,7 +91,16 @@ fn swap_task_borrow_list(f: &fn(~[BorrowRecord]) -> ~[BorrowRecord]) {
     }
 }
 
-pub fn fail_borrowed(box: *mut BoxRepr, file: *c_char, line: size_t) {
+pub unsafe fn clear_task_borrow_list() {
+    // pub because it is used by the box annihilator.
+    let cur_task = rust_get_task();
+    let ptr = rustrt::rust_take_task_borrow_list(cur_task);
+    if !ptr.is_null() {
+        let _: ~[BorrowRecord] = transmute(ptr);
+    }
+}
+
+fn fail_borrowed(box: *mut BoxRepr, file: *c_char, line: size_t) {
     debug_ptr("fail_borrowed: ", box);
 
     if !::rt::env::get().debug_borrows {