Fix bug where return type checking was overzealous and interfered wit…

…h generators
ircmaxell · Feb 18, 2015 · e2053fa · e2053fa
1 parent 9109e48
commit e2053fa
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Zend/tests/generators/generator_return_without_value.phpt b/Zend/tests/generators/generator_return_without_value.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Generators can return without values
+--FILE--
+<?php
+
+function gen() {
+    yield;
+    return;
+}
+
+function gen2() {
+    yield;
+    return null;
+}
+
+var_dump(gen());
+
+var_dump(gen2());
+
+?>
+--EXPECTF--
+object(Generator)#%d (0) {
+}
+object(Generator)#%d (0) {
+}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -3268,7 +3268,8 @@ void zend_compile_return(zend_ast *ast) /* {{{ */
 		opline->op1.var = CG(context).fast_call_var;
 	}
 
-	if (CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+    // Generator return types are handled separately
+	if (!(CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) && CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 		zend_arg_info *arg_info = CG(active_op_array)->arg_info - 1;
 
 		/* for scalar, weak return types, the value may be casted