Fix GH-15375: nested "yield from" skips items after valid()/next()#22640
Open
iliaal wants to merge 1 commit into
Open
Fix GH-15375: nested "yield from" skips items after valid()/next()#22640iliaal wants to merge 1 commit into
iliaal wants to merge 1 commit into
Conversation
The DO_INIT guard in zend_generator_resume() that avoids re-advancing an already-primed delegate read the flag on orig_generator, but in a nested "yield from" chain the fresh delegation is established by a middle generator rather than the outermost consumer. Track the delegating generator through the resume loop and check its DO_INIT, so a primed inner generator reached through two "yield from" levels yields its current value once instead of skipping it. Fixes phpGH-15375
iliaal
requested review from
Girgias and
TimWolla
and removed request for
TimWolla
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Nested
yield fromdrops the inner generator's current value on the second and later delegations when it was primed viavalid()/next(). TheZEND_GENERATOR_DO_INITguard inzend_generator_resume()reads the flag onorig_generator, but in a nested chain the fresh delegation is established by the middle generator, whose flag it never checks. Track and check the delegating generator instead.Fixes #15375