about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2011-08-02 10:24:06 +0200
committerMarijn Haverbeke <marijnh@gmail.com>2011-08-02 10:24:06 +0200
commit8d8ff16dfeca9681f6ad56749a143f10a736c76d (patch)
tree6de73ee41c5fb70b4f06c7b2646d153e5420e208 /src
parent5cf5f5024d5efcbb0b399433fa2117e1146292c2 (diff)
downloadrust-8d8ff16dfeca9681f6ad56749a143f10a736c76d.tar.gz
rust-8d8ff16dfeca9681f6ad56749a143f10a736c76d.zip
Improve handling of bottom type in alt arms
Diffstat (limited to 'src')
-rw-r--r--src/comp/middle/typeck.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 07dfedad6c0..099cd045e6b 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) {