---

yaml
---
r: 4367
b: refs/heads/master
c: 948f809
h: refs/heads/master
i:
  4365: 38aff13
  4363: 9015829
  4359: 3e92553
  4351: 280c87a
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13f8b3f2a67a4e3a7a26b0e238e1b6ce9e1f3573
+refs/heads/master: 948f8090ae66ea9207473bf97d5c0dfaee4244ed

trunk/src/comp/middle/trans_alt.rs

@@ -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],

trunk/src/test/run-fail/alt-disc-bot.rs

@@ -0,0 +1,4 @@
+// error-pattern:quux
+fn f() -> ! { fail "quux" }
+fn g() -> int { alt f() { true { 1 } false { 0 } }; }
+fn main() { g(); }