---

yaml
---
r: 21838
b: refs/heads/snap-stage3
c: 1c5db46
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 24c89693f0556ba4b455df358a9136f7873776bf
+refs/heads/snap-stage3: 1c5db46f8e44441ba1aa11f0f607b7c015fd1fa5
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -71,13 +71,13 @@ struct Task {
 #[lang="annihilate"]
 pub unsafe fn annihilate() {
     use rt::rt_free;
+    use io::WriterUtil;
 
     let task: *Task = transmute(rustrt::rust_get_task());
 
     // Pass 1: Make all boxes immortal.
     let box = (*task).boxed_region.live_allocs;
     let mut box: *mut BoxRepr = transmute(copy box);
-    assert (*box).prev == null();
     while box != mut_null() {
         debug!("making box immortal: %x", box as uint);
         (*box).ref_count = 0x77777777;
@@ -87,7 +87,6 @@ pub unsafe fn annihilate() {
     // Pass 2: Drop all boxes.
     let box = (*task).boxed_region.live_allocs;
     let mut box: *mut BoxRepr = transmute(copy box);
-    assert (*box).prev == null();
     while box != mut_null() {
         debug!("calling drop glue for box: %x", box as uint);
         let tydesc: *TypeDesc = transmute(copy (*box).type_desc);

branches/snap-stage3/src/rustc/middle/trans/base.rs

@@ -1984,17 +1984,22 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
         let bcx = top_scope_block(fcx, None);
         let lltop = bcx.llbb;
 
+        // Call main.
         let lloutputarg = llvm::LLVMGetParam(llfdecl, 0 as c_uint);
         let llenvarg = llvm::LLVMGetParam(llfdecl, 1 as c_uint);
         let mut args = ~[lloutputarg, llenvarg];
         if takes_argv {
             vec::push(args, llvm::LLVMGetParam(llfdecl, 2 as c_uint));
         }
         Call(bcx, main_llfn, args);
-        build_return(bcx);
 
-        finish_fn(fcx, lltop);
+        // Call the box annihilator.
+        let did = bcx.tcx().lang_items.annihilate_fn.get();
+        let bcx = callee::trans_rtcall_or_lang_call(bcx, did, ~[],
+                                                    expr::Ignore);
 
+        build_return(bcx);
+        finish_fn(fcx, lltop);
         return llfdecl;
     }