Fix collection of unfinished function call in fibers #10557
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
arnaud-lb
commented
Feb 10, 2023
Comment on lines
+4462
to
+4479
| ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer) | ||
| { | ||
| bool suspended_by_yield = false; | ||
|
|
||
| if (Z_TYPE_INFO(EX(This)) & ZEND_CALL_GENERATOR) { | ||
| ZEND_ASSERT(EX(return_value)); | ||
|
|
||
| /* The generator object is stored in EX(return_value) */ | ||
| zend_generator *generator = (zend_generator*) EX(return_value); | ||
| ZEND_ASSERT(execute_data == generator->execute_data); | ||
|
|
||
| suspended_by_yield = !(generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING); | ||
| } | ||
|
|
||
| return zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, suspended_by_yield); | ||
| } | ||
|
|
||
| ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield) |
There was a problem hiding this comment.
This avoids breaking ABI, although zend_unfinished_execution_gc was only introduced in the last patch release.
There was a problem hiding this comment.
The ABI number is the last time ABI was broken (which defacto is every minor version). Here ABI is not broken, but the original function preserved and a new one added. Hence it's a non-issue.
There was a problem hiding this comment.
As I don't know how ABI breaks are meant to be handled for stuff released after GA.
Not at all; keeping ABI compat after first GA of a minor is a pretty strict policy (otherwise all extensions etc. would need to be rebuilt).
But yeah, not an issue here.
|
Looks proper to me :-) Thanks! |
bwoebi
approved these changes
Feb 13, 2023
|
Merged as d721dcc. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes GH-10496
See #10508 (comment)