---

yaml
---
r: 2701
b: refs/heads/master
c: 779dd80
h: refs/heads/master
i:
  2699: f2f5022
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4eec215ccee45fc4a2c23bcb127951ae5250af
+refs/heads/master: 779dd809d279ee26068365f0fd47583e7a488781

trunk/src/comp/middle/trans.rs

@@ -6425,7 +6425,8 @@ fn trans_block(&@block_ctxt cx, &ast::block b) -> result {
                 ret r;
             } else {
                 auto r_ty = ty::expr_ty(cx.fcx.lcx.ccx.tcx, e);
-                if (!ty::type_is_nil(cx.fcx.lcx.ccx.tcx, r_ty)) {
+                if (!ty::type_is_nil(cx.fcx.lcx.ccx.tcx, r_ty)
+                    && !ty::type_is_bot(cx.fcx.lcx.ccx.tcx, r_ty)) {
                     // The value resulting from the block gets copied into an
                     // alloca created in an outer scope and its refcount
                     // bumped so that it can escape this block. This means