user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: Use obstacks in lieu of dynamically-allocated frames only when the frame is actually dynamically-sized

Browse source
This commit is contained in:
Patrick Walton 2011-08-17 18:14:47 -07:00
parent 0b7af40384
commit f17edf9829
6 changed files with 57 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -466,17 +466,28 @@ fn alloca(cx: &@block_ctxt, t: TypeRef) -> ValueRef {
}
fn array_alloca(cx: &@block_ctxt, t: TypeRef, n: ValueRef) -> ValueRef {
let bcx = cx;
let builder = new_builder(cx.fcx.lldynamicallocas);
let lltaskptr = bcx_fcx(bcx).lltaskptr;
alt bcx_fcx(cx).llobstacktoken {
none. {
let dynastack_mark = bcx_ccx(cx).upcalls.dynastack_mark;
let lltaskptr = bcx_fcx(cx).lltaskptr;
bcx_fcx(cx).llobstacktoken =
some(builder.Call(dynastack_mark, ~[lltaskptr]));
some(mk_obstack_token(bcx_ccx(cx), cx.fcx.lldynamicallocas,
lltaskptr));
}
some(_) { /* no-op */ }
}
ret builder.ArrayAlloca(t, n);
let dynastack_alloc = bcx_ccx(bcx).upcalls.dynastack_alloc;
let llsz = builder.Mul(C_uint(llsize_of_real(bcx_ccx(bcx), t)), n);
let llresult = builder.Call(dynastack_alloc, ~[lltaskptr, llsz]);
ret builder.PointerCast(llresult, T_ptr(t));
}
fn mk_obstack_token(ccx: &@crate_ctxt, lldynamicallocas: BasicBlockRef,
lltaskptr: ValueRef) -> ValueRef {
let builder = new_builder(lldynamicallocas);
ret builder.Call(ccx.upcalls.dynastack_mark, ~[lltaskptr]);
}

1
src/comp/middle/trans_common.rs
View file

@ -217,7 +217,6 @@ type fn_ctxt = {
mutable llreturn: BasicBlockRef,
// The token used to clear the dynamic allocas at the end of this frame.
// Will be |none| if there are no dynamic allocas.
mutable llobstacktoken: option::t<ValueRef>,
// The 'self' object currently in use in this function, if there