From 8d8ff16dfeca9681f6ad56749a143f10a736c76d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Aug 2011 10:24:06 +0200
Subject: [PATCH] Improve handling of bottom type in alt arms

---
 src/comp/middle/typeck.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 07dfedad6c06..099cd045e6bb 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -2000,6 +2000,7 @@ fn check_expr(fcx: &@fn_ctxt, expr: &@ast::expr) -> bool {
             }
         }
         bot |= !arm_non_bot;
+        if !arm_non_bot { result_ty = ty::mk_bot(fcx.ccx.tcx); }
         write::ty_only_fixup(fcx, id, result_ty);
       }
       ast::expr_fn(f) {