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

Handle _|_ - typed discriminants in alts correctly

Browse source 
Stop me, won't you, if you've heard this one before?

Closes #794
This commit is contained in:
Tim Chevalier 2011-08-02 19:02:38 -07:00
parent 13f8b3f2a6
commit 948f8090ae
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/comp/middle/trans_alt.rs
View file

@ -425,6 +425,18 @@ fn trans_alt(cx: &@block_ctxt, expr: &@ast::expr, arms: &ast::arm[],
id: ast::node_id, output: &trans::out_method) -> result {
let bodies = ~[];
let match: match = ~[];
let er = trans::trans_expr(cx, expr);
if (ty::type_is_bot(bcx_tcx(cx), ty::expr_ty(bcx_tcx(cx), expr))) {
// No need to generate code for alt,
// since the disc diverges.
if (!cx.build.is_terminated()) {
ret rslt(cx, cx.build.Unreachable());
}
else {
ret rslt(cx, C_nil());
}
}
for a: ast::arm in arms {
let body = new_scope_block_ctxt(cx, "case_body");
bodies += ~[body];
@ -445,7 +457,6 @@ fn trans_alt(cx: &@block_ctxt, expr: &@ast::expr, arms: &ast::arm[],
}
let exit_map = ~[];
let er = trans::trans_expr(cx, expr);
let t = trans::node_id_type(cx.fcx.lcx.ccx, expr.id);
let v = trans::spill_if_immediate(er.bcx, er.val, t);
compile_submatch(er.bcx, match, ~[v],