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

rustc: Blocks shouldn't try to return results for ty_bot

Browse Source
This commit is contained in:
Brian Anderson 2011-05-21 12:56:31 -04:00
parent 7b4eec215c
commit 779dd809d2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6425,7 +6425,8 @@ fn trans_block(&@block_ctxt cx, &ast::block b) -> result {
ret r;
} else {
auto r_ty = ty::expr_ty(cx.fcx.lcx.ccx.tcx, e);
if (!ty::type_is_nil(cx.fcx.lcx.ccx.tcx, r_ty)) {
if (!ty::type_is_nil(cx.fcx.lcx.ccx.tcx, r_ty)
&& !ty::type_is_bot(cx.fcx.lcx.ccx.tcx, r_ty)) {
// The value resulting from the block gets copied into an
// alloca created in an outer scope and its refcount
// bumped so that it can escape this block. This means