Repository navigation
[mypyc] Fix segfault in zip() with an unfinished native generator - #22144
Merged
Merged
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
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 mypyc/mypyc#1234.
A
forloop over a call to a compiled generator function calls the generator's helper method directly (ForNativeGenerator, added in #19415). The helper sets the generator's return value only when the generator returns, so if the helper returns NULL without setting it, the generator raised. This was checked ingen_cleanup(), which runs when the loop exits. That works for a plain loop, but inzip()another iterator can end the loop while the generator is suspended. The return value was NULL then too, so the loop took its error path without an exception set, and crashed.The check now happens in
gen_condition(), in a block that's only reached when the generator stops, soForNativeGeneratorno longer needs a cleanup block. For other loops, the generated code is the same, just in a different order. No IR tests cover these loops, so none change.