---

yaml
---
r: 23948
b: refs/heads/master
c: 73e8ce1
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: aa2ab2659f6c7aca79ddaaac5370da8aea6a18d6
+refs/heads/master: 73e8ce1e1f2461995031421b555d48da7f5ea086
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/task.rs

@@ -1355,10 +1355,16 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
                 let group = @TCB(child, move child_arc, move ancestors,
                                  is_main, move notifier);
                 unsafe { local_set(child, taskgroup_key!(), group); }
+
                 // Run the child's body.
                 f();
+
                 // TLS cleanup code will exit the taskgroup.
             }
+
+            // Run the box annihilator.
+            // XXX: Crashy.
+            // unsafe { cleanup::annihilate(); }
         };
 
         // Set up membership in taskgroup and descendantship in all ancestor

trunk/src/rustc/middle/trans/base.rs

@@ -1994,9 +1994,10 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
         Call(bcx, main_llfn, args);
 
         // 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);
+        // XXX: Crashes.
+        //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);