Commit 5e5ac83

committed

Fix cli test

Set the ZEND_CALL_GENERATOR flag on the fake frame also, and set the func field for the empty top frame in cli, to be safe.

1 parent 75620c6 commit 5e5ac83Copy full SHA for 5e5ac83

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1725,7 +1725,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int`
`1725`	`1725`	`}`
`1726`	`1726`
`1727`	`1727`	`while (call && (limit == 0 \|\| frameno < limit)) {`
`1728`		`- if (UNEXPECTED(!call->func)) {`
	`1728`	`+ if (UNEXPECTED((ZEND_CALL_INFO(call) &ZEND_CALL_GENERATOR) &&!call->func)) {`
`1729`	`1729`	`/* This is the fake frame inserted for nested generators. Normally,`
`1730`	`1730`	`* this frame is preceded by the actual generator frame and then`
`1731`	`1731`	`* replaced by zend_generator_check_placeholder_frame() below.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4473,6 +4473,7 @@ ZEND_VM_HANDLER(139, ZEND_GENERATOR_CREATE, ANY, ANY)`
`4473`	`4473`	`generator->execute_fake.func = NULL;`
`4474`	`4474`	`generator->execute_fake.prev_execute_data = NULL;`
`4475`	`4475`	`ZVAL_OBJ(&generator->execute_fake.This, (zend_object *) generator);`
	`4476`	`+ ZEND_ADD_CALL_FLAG(&generator->execute_fake, ZEND_CALL_GENERATOR);`
`4476`	`4477`
`4477`	`4478`	`gen_execute_data->opline = opline + 1;`
`4478`	`4479`	`/* EX(return_value) keeps pointer to zend_object (not a real zval) */`

Lines changed: 1 addition & 0 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1075,6 +1075,7 @@ static int do_cli(int argc, char *argv) / {{{ */`
`1075`	`1075`	`object_init_ex(&ref, pce);`
`1076`	`1076`
`1077`	`1077`	`memset(&execute_data, 0, sizeof(zend_execute_data));`
	`1078`	`+ execute_data.func = (zend_function *) &zend_pass_function;`
`1078`	`1079`	`EG(current_execute_data) = &execute_data;`
`1079`	`1080`	`zend_call_known_instance_method_with_1_params(`
`1080`	`1081`	`pce->constructor, Z_OBJ(ref), NULL, &arg);`

Comments

(0)