bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Try harder still to generate fewer landing pads

Browse source 
Scopes that don't have cleanups don't need their own landing pads

This takes the optimized rustc bin from 4.7MB to 4.4
This commit is contained in:
Brian Anderson 2011-09-13 16:40:18 -07:00
parent b8e31ac469
commit 6d3dd0e48c
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/comp/middle/trans.rs
View file

@ -3738,7 +3738,7 @@ fn invoke_(bcx: @block_ctxt, llfn: ValueRef,
}
fn get_landing_pad(bcx: @block_ctxt) -> BasicBlockRef {
let scope_bcx = find_scope_cx(bcx);
let scope_bcx = find_scope_for_lpad(bcx);
if scope_bcx.need_new_lpad {
let unwind_bcx = new_sub_block_ctxt(bcx, "unwind");
let lpadbb = trans_landing_pad(unwind_bcx);
@ -3747,6 +3747,24 @@ fn get_landing_pad(bcx: @block_ctxt) -> BasicBlockRef {
}
assert option::is_some(scope_bcx.lpad);
ret option::get(scope_bcx.lpad);
fn find_scope_for_lpad(bcx: @block_ctxt) -> @block_ctxt {
let scope_bcx = bcx;
while true {
scope_bcx = find_scope_cx(scope_bcx);
if vec::is_not_empty(scope_bcx.cleanups) {
ret scope_bcx;
} else {
scope_bcx = alt scope_bcx.parent {
parent_some(b) { b }
parent_none. {
ret scope_bcx;
}
}
}
}
fail;
}
}
fn trans_landing_pad(bcx: @block_ctxt) -> BasicBlockRef {