rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Call the box annihilator in main

Browse Source
This commit is contained in:
Patrick Walton
2012-09-14 18:05:15 -07:00
parent 24c89693f0
commit 1c5db46f8e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcore/cleanup.rs
View File

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

9
src/rustc/middle/trans/base.rs
View File

@@ -1984,6 +1984,7 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
let bcx = top_scope_block(fcx, None); let bcx = top_scope_block(fcx, None);
let lltop = bcx.llbb; let lltop = bcx.llbb;
// Call main.
let lloutputarg = llvm::LLVMGetParam(llfdecl, 0 as c_uint); let lloutputarg = llvm::LLVMGetParam(llfdecl, 0 as c_uint);
let llenvarg = llvm::LLVMGetParam(llfdecl, 1 as c_uint); let llenvarg = llvm::LLVMGetParam(llfdecl, 1 as c_uint);
let mut args = ~[lloutputarg, llenvarg]; let mut args = ~[lloutputarg, llenvarg];
@@ -1991,10 +1992,14 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
vec::push(args, llvm::LLVMGetParam(llfdecl, 2 as c_uint)); vec::push(args, llvm::LLVMGetParam(llfdecl, 2 as c_uint));
} }
Call(bcx, main_llfn, args); 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);
build_return(bcx); build_return(bcx);
finish_fn(fcx, lltop); finish_fn(fcx, lltop);
return llfdecl; return llfdecl;
} }