summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-03-07 00:28:12 +0100
committerBob Weinand <bobwei9@hotmail.com>2015-03-07 00:28:12 +0100
commitb4a142ab974747be2fd03d055b30c63286a687fd (patch)
tree1d88392c6c1fe6c07d77d284f51c31d23bb78379 /Zend/zend_builtin_functions.c
parentfcdb6e0811953b2aa57f755632add0f67b01e6bc (diff)
downloadphp-git-b4a142ab974747be2fd03d055b30c63286a687fd.tar.gz
Added yield from operator
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index da90e4c98d..99908c11b1 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -27,6 +27,7 @@
#include "zend_exceptions.h"
#include "zend_extensions.h"
#include "zend_closures.h"
+#include "zend_generators.h"
#undef ZEND_TEST_EXCEPTIONS
@@ -2249,6 +2250,8 @@ ZEND_FUNCTION(debug_print_backtrace)
call_type = NULL;
ZVAL_UNDEF(&arg_array);
+ ptr = zend_generator_check_placeholder_frame(ptr);
+
skip = ptr;
/* skip internal handler */
if ((!skip->func || !ZEND_USER_CODE(skip->func->common.type)) &&
@@ -2444,6 +2447,8 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
frameno++;
array_init(&stack_frame);
+ ptr = zend_generator_check_placeholder_frame(ptr);
+
skip = ptr;
/* skip internal handler */
if ((!skip->func || !ZEND_USER_CODE(skip->func->common.type)) &&