mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove misguided indirect return in trans_closure

Browse Source 
Closes #1528
This commit is contained in:
Marijn Haverbeke 2012-01-16 14:27:41 +01:00
parent 498ad91d06
commit d673f76fdf
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/comp/middle/trans.rs
View File

@ -4463,14 +4463,10 @@ fn trans_closure(cx: @local_ctxt, sp: span, decl: ast::fn_decl,
// translation calls that don't have a return value (trans_crate,
// trans_mod, trans_item, et cetera) and those that do
// (trans_block, trans_expr, et cetera).
if ty::type_is_bot(cx.ccx.tcx, block_ty) ||
ty::type_is_nil(cx.ccx.tcx, block_ty) ||
option::is_none(body.node.expr) {
bcx = trans_block_dps(bcx, body, ignore);
} else if ty::type_is_immediate(cx.ccx.tcx, block_ty) {
let cell = empty_dest_cell();
bcx = trans_block_dps(bcx, body, by_val(cell));
Store(bcx, *cell, fcx.llretptr);
if option::is_none(body.node.expr) ||
ty::type_is_bot(cx.ccx.tcx, block_ty) ||
ty::type_is_nil(cx.ccx.tcx, block_ty) {
bcx = trans_block(bcx, body);
} else {
bcx = trans_block_dps(bcx, body, save_in(fcx.llretptr));
}