com php-src: Forbid yield from in by-reference generators: Zend/tests/generators/yield_from_by_reference.phpt Ze nd/zend_compile.c
| From: | Nikita Popov | Date: | Fri, 12 Feb 2016 16:55:29 +0000 |
| Subject: | com php-src: Forbid yield from in by-reference generators: Zend/tests/generators/yield_from_by_reference.phpt Ze nd/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90996@lists.php.net to get a copy of this message | ||
Commit: ccc06e252bdf4c54cb2c96dbcab9a2aeb933181c
Author: Nikita Popov <nikic@php.net> Fri, 12 Feb 2016 17:55:29 +0100
Parents: 9cebdc5d4741c9a3a847ca473fd1742c75ca7740
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ccc06e252bdf4c54cb2c96dbcab9a2aeb933181c
Log:
Forbid yield from in by-reference generators
The current yield from implementation doesn't support by-ref
yields. It's likely not worthwhile to actually implement this,
but we should at least keep the door open for the future by
issuing a compile error.
Refs bug #71252.
Bugs:
https://bugs.php.net/71252
Changed paths:
A Zend/tests/generators/yield_from_by_reference.phpt
M Zend/zend_compile.c
Diff:
diff --git a/Zend/tests/generators/yield_from_by_reference.phpt
b/Zend/tests/generators/yield_from_by_reference..phpt
new file mode 100644
index 0000000..8412a32
--- /dev/null
+++ b/Zend/tests/generators/yield_from_by_reference.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Yield from by reference is not supported
+--FILE--
+<?php
+
+function &gen() {
+ yield from [];
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use "yield from" inside a by-reference generator in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 58be2ed..56da296 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6294,6 +6294,11 @@ void zend_compile_yield_from(znode *result, zend_ast *ast) /* {{{ */
zend_mark_function_as_generator();
+ if (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
+ zend_error_noreturn(E_COMPILE_ERROR,
+ "Cannot use \"yield from\" inside a by-reference generator");
+ }
+
zend_compile_expr(&expr_node, expr_ast);
zend_emit_op_tmp(result, ZEND_YIELD_FROM, &expr_node, NULL);
}