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

Handle conditionals on _|_ - typed values correctly

Browse source 
Closes #776
This commit is contained in:
Tim Chevalier 2011-08-02 18:22:00 -07:00
parent 7c34550931
commit 13f8b3f2a6
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3592,6 +3592,18 @@ fn trans_if(cx: &@block_ctxt, cond: &@ast::expr, thn: &ast::blk,
els: &option::t[@ast::expr], id: ast::node_id,
output: &out_method) -> result {
let cond_res = trans_expr(cx, cond);
if (ty::type_is_bot(bcx_tcx(cx), ty::expr_ty(bcx_tcx(cx), cond))) {
// No need to generate code for comparison,
// since the cond diverges.
if (!cx.build.is_terminated()) {
ret rslt(cx, cx.build.Unreachable());
}
else {
ret rslt(cx, C_nil());
}
}
let then_cx = new_scope_block_ctxt(cx, "then");
let then_res = trans_block(then_cx, thn, output);
let else_cx = new_scope_block_ctxt(cx, "else");