---

yaml
---
r: 5069
b: refs/heads/master
c: 7c02517
h: refs/heads/master
i:
  5067: 766bb71
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722fa00681fe1d9538cb904e9a9489ac79bf7b5e
+refs/heads/master: 7c02517f758a20e8d5893c8b2024fbf87f7a0447

trunk/src/comp/middle/tstate/ck.rs

@@ -145,7 +145,7 @@ fn check_states_against_conditions(fcx: &fn_ctxt, f: &_fn,
 
     /* Check that the return value is initialized */
     let post = aux::block_poststate(fcx.ccx, f.body);
-    if f.proto == ast::proto_fn &&
+    if f.proto != ast::proto_iter &&
            !promises(fcx, post, fcx.enclosing.i_return) &&
            !type_is_nil(fcx.ccx.tcx, ret_ty_of_fn(fcx.ccx.tcx, id)) &&
            f.decl.cf == return {

trunk/src/test/compile-fail/block-require-return.rs

@@ -0,0 +1,5 @@
+// error-pattern: not all control paths return
+fn force(f: &block() -> int) -> int { f() }
+fn main() {
+    log_err force({| | });
+}