---

marijnh · marijnh · commit 2c970804df79 · 2011-08-02T10:24:06.000+02:00
yaml --- r: 4318 b: refs/heads/master c: 8d8ff16 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf5f5024d5efcbb0b399433fa2117e1146292c2
+refs/heads/master: 8d8ff16dfeca9681f6ad56749a143f10a736c76d
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/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) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 5cf5f5024d5efcbb0b399433fa2117e1146292c2`
	`2`	`+refs/heads/master: 8d8ff16dfeca9681f6ad56749a143f10a736c76d`
Original file line number	Diff line number	Diff line change
`@@ -2000,6 +2000,7 @@ fn check_expr(fcx: &@fn_ctxt, expr: &@ast::expr) -> bool {`
`2000`	`2000`	`}`
`2001`	`2001`	`}`
`2002`	`2002`	`bot \|= !arm_non_bot;`
	`2003`	`+ if !arm_non_bot { result_ty = ty::mk_bot(fcx.ccx.tcx); }`
`2003`	`2004`	`write::ty_only_fixup(fcx, id, result_ty);`
`2004`	`2005`	`}`
`2005`	`2006`	`ast::expr_fn(f) {`