Skip to content

Commit 73e8ce1

Browse files
committed
rustc: Back out box annihilator
1 parent aa2ab26 commit 73e8ce1

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/libcore/task.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,10 +1355,16 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
13551355
let group = @TCB(child, move child_arc, move ancestors,
13561356
is_main, move notifier);
13571357
unsafe { local_set(child, taskgroup_key!(), group); }
1358+
13581359
// Run the child's body.
13591360
f();
1361+
13601362
// TLS cleanup code will exit the taskgroup.
13611363
}
1364+
1365+
// Run the box annihilator.
1366+
// XXX: Crashy.
1367+
// unsafe { cleanup::annihilate(); }
13621368
};
13631369

13641370
// Set up membership in taskgroup and descendantship in all ancestor

src/rustc/middle/trans/base.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,9 +1994,10 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
19941994
Call(bcx, main_llfn, args);
19951995

19961996
// Call the box annihilator.
1997-
let did = bcx.tcx().lang_items.annihilate_fn.get();
1998-
let bcx = callee::trans_rtcall_or_lang_call(bcx, did, ~[],
1999-
expr::Ignore);
1997+
// XXX: Crashes.
1998+
//let did = bcx.tcx().lang_items.annihilate_fn.get();
1999+
//let bcx = callee::trans_rtcall_or_lang_call(bcx, did, ~[],
2000+
// expr::Ignore);
20002001

20012002
build_return(bcx);
20022003
finish_fn(fcx, lltop);

0 commit comments

Comments
 (0)