Skip to content

Commit 5ece3ec

Browse files
committed
Fix bogus traces with ReflectionGenerator::getTrace()
1 parent 29a8981 commit 5ece3ec

File tree

5 files changed

+67
-3
lines changed

5 files changed

+67
-3
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ PHP NEWS
1717
- Standard:
1818
. Fixed bug #70295 (Segmentation fault with setrawcookie). (Bob)
1919

20+
- Reflection:
21+
. Fixed bug causing bogus traces for ReflectionGenerator::getTrace(). (Bob)
22+
2023
20 Aug 2015, PHP 7.0.0 RC 1
2124

2225
- Core:

Zend/zend_generators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static ZEND_COLD zend_function *zend_generator_get_constructor(zend_object *obje
273273

274274
ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_data *ptr)
275275
{
276-
if (!ptr->func && ptr->prev_execute_data && Z_OBJ(ptr->This)) {
276+
if (!ptr->func && Z_OBJ(ptr->This)) {
277277
if (Z_OBJCE(ptr->This) == zend_ce_generator) {
278278
zend_generator *generator = (zend_generator *) Z_OBJ(ptr->This);
279279
zend_generator *root = (generator->node.children < 1 ? generator : generator->node.ptr.leaf)->node.ptr.root;

ext/reflection/tests/ReflectionGenerator_basic.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ object(Generator)#2 (0) {
3939
}
4040
array(1) {
4141
[0]=>
42-
array(2) {
42+
array(4) {
43+
["file"]=>
44+
string(%d) "%s"
45+
["line"]=>
46+
int(%d)
4347
["function"]=>
4448
string(3) "foo"
4549
["args"]=>
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
--TEST--
2+
ReflectionGenerator::getTrace() over multiple Generators
3+
--FILE--
4+
<?php
5+
6+
function foo() {
7+
yield 1;
8+
yield 2;
9+
}
10+
11+
function bar()
12+
{
13+
yield from foo();
14+
}
15+
16+
function baz()
17+
{
18+
yield from bar();
19+
}
20+
21+
$gen = baz();
22+
$gen->valid();
23+
24+
var_dump((new ReflectionGenerator($gen))->getTrace());
25+
26+
?>
27+
--EXPECTF--
28+
array(2) {
29+
[0]=>
30+
array(4) {
31+
["file"]=>
32+
string(%d) "%s"
33+
["line"]=>
34+
int(%d)
35+
["function"]=>
36+
string(3) "foo"
37+
["args"]=>
38+
array(0) {
39+
}
40+
}
41+
[1]=>
42+
array(4) {
43+
["file"]=>
44+
string(%d) "%s"
45+
["line"]=>
46+
int(%d)
47+
["function"]=>
48+
string(3) "bar"
49+
["args"]=>
50+
array(0) {
51+
}
52+
}
53+
}

ext/reflection/tests/ReflectionGenerator_in_Generator.phpt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ object(ReflectionFunction)#4 (1) {
4646
NULL
4747
array(1) {
4848
[0]=>
49-
array(2) {
49+
array(4) {
50+
["file"]=>
51+
string(%d) "%s"
52+
["line"]=>
53+
int(%d)
5054
["function"]=>
5155
string(9) "{closure}"
5256
["args"]=>

0 commit comments

Comments
 (0)