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

Merge remote-tracking branch 'graydon/master'

Browse source
This commit is contained in:
Michael Sullivan 2011-08-18 18:16:11 -07:00
commit 30b5f851c5
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5626,7 +5626,9 @@ fn alloc_ty(cx: &@block_ctxt, t: &ty::t) -> result {
// past caller conventions and may well make sense again,
// so we leave it as-is.
bcx = gc::add_gc_root(bcx, val, t);
if (bcx_tcx(cx).sess.get_opts().do_gc) {
bcx = gc::add_gc_root(bcx, val, t);
}
ret rslt(cx, val);
}