Commit 69bcbdc

committed

Fix handling of nested generator in zend_test observer

This is the counterpart of GH-15952. Fixes GH-16514 Closes GH-16530

1 parent 8720063 commit 69bcbdcCopy full SHA for 69bcbdc

File tree

+63

-0

lines changed

+63

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "zend_observer.h"`
`21`	`21`	`#include "zend_smart_str.h"`
`22`	`22`	`#include "ext/standard/php_var.h"`
	`23`	`+#include "zend_generators.h"`
`23`	`24`
`24`	`25`	`static zend_observer_fcall_handlers observer_fcall_init(zend_execute_data *execute_data);`
`25`	`26`
`@@ -163,6 +164,11 @@ static void observer_show_init_backtrace(zend_execute_data *execute_data)`
`163`	`164`	`zend_execute_data *ex = execute_data;`
`164`	`165`	`php_printf("%s<!--\n", 2 ZT_G(observer_nesting_depth), "");`
`165`	`166`	`do {`
	`167`	`+ if (UNEXPECTED(!ex->func)) {`
	`168`	`+ ex = zend_generator_check_placeholder_frame(ex);`
	`169`	`+ ZEND_ASSERT(ex->func);`
	`170`	`+ }`
	`171`	`+`
`166`	`172`	`zend_function *fbc = ex->func;`
`167`	`173`	`int indent = 2 * ZT_G(observer_nesting_depth) + 4;`
`168`	`174`	`if (fbc->common.function_name) {`

Lines changed: 57 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,57 @@`
	`1`	`+--TEST--`
	`2`	`+GH-16514: Nested generator in zend_test observer`
	`3`	`+--EXTENSIONS--`
	`4`	`+zend_test`
	`5`	`+--INI--`
	`6`	`+zend_test.observer.enabled=1`
	`7`	`+zend_test.observer.show_init_backtrace=1`
	`8`	`+--FILE--`
	`9`	`+<?php`
	`10`	`+`
	`11`	`+class Foo {`
	`12`	`+ public function __destruct() {`
	`13`	`+ debug_print_backtrace();`
	`14`	`+ }`
	`15`	`+}`
	`16`	`+function bar() {`
	`17`	`+ yield from foo();`
	`18`	`+}`
	`19`	`+function foo() {`
	`20`	`+ $foo = new Foo();`
	`21`	`+ yield;`
	`22`	`+}`
	`23`	`+$gen = bar();`
	`24`	`+foreach ($gen as $dummy);`
	`25`	`+`
	`26`	`+?>`
	`27`	`+--EXPECTF--`
	`28`	`+<!-- init '%sgh16514.php' -->`
	`29`	`+<!--`
	`30`	`+ {main} %sgh16514.php`
	`31`	`+-->`
	`32`	`+<!-- init bar() -->`
	`33`	`+<!--`
	`34`	`+ bar()`
	`35`	`+ {main} %sgh16514.php`
	`36`	`+-->`
	`37`	`+<!-- init foo() -->`
	`38`	`+<!--`
	`39`	`+ foo()`
	`40`	`+ bar()`
	`41`	`+ {main} %sgh16514.php`
	`42`	`+-->`
	`43`	`+<!-- init Foo::__destruct() -->`
	`44`	`+<!--`
	`45`	`+ Foo::__destruct()`
	`46`	`+ bar()`
	`47`	`+ {main} %sgh16514.php`
	`48`	`+-->`
	`49`	`+<!-- init debug_print_backtrace() -->`
	`50`	`+<!--`
	`51`	`+ debug_print_backtrace()`
	`52`	`+ Foo::__destruct()`
	`53`	`+ bar()`
	`54`	`+ {main} %sgh16514.php`
	`55`	`+-->`
	`56`	`+#0 %s(%d): Foo->__destruct()`
	`57`	`+#1 %s(%d): bar()`

Comments

(0)