bpo-43683: Handle generator entry in bytecode #25138
Merged
Conversation
This file contains 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
markshannon
force-pushed
the
handle-generator-entry-in-bytecode
branch
from
4dff1d0 to
46c71f5
Compare
willingc
reviewed
Apr 3, 2021
Misc/NEWS.d/next/Core and Builtins/2021-04-01-12-30-30.bpo-43683.AjxOx2.rst
Outdated
Show resolved
Hide resolved
Misc/NEWS.d/next/Core and Builtins/2021-04-01-12-30-30.bpo-43683.AjxOx2.rst
Outdated
Show resolved
Hide resolved
…o bytecode. Document new bytecode and make it fail gracefully if mis-compiled. Add NEWS item Bump magic number.
markshannon
force-pushed
the
handle-generator-entry-in-bytecode
branch
from
46c71f5 to
1a29ec3
Compare
gvanrossum
reviewed
Apr 6, 2021
gvanrossum
reviewed
Apr 6, 2021
| @@ -6685,6 +6726,10 @@ assemble(struct compiler *c, int addNone) | |||
| entryblock = b; | |||
| } | |||
|
|
|||
| if (insert_generator_prefix(c, entryblock)) { | |||
There was a problem hiding this comment.
If we're compiling a generator (or coroutine etc.) the new function assumes (without asserting) that entryblock is not NULL. But evidently it could be, since below on line 6690 there's a check whether it could be. I don't know how it could be NULL - that would mean there's no code in the function at all, but it seems there's code above that always adds at least one instruction (RETURN_VALUE on line 6668). So maybe the check for entryblock == NULL below can be replaced by an assert? (I'd place that assert right underneath the for-loop above on lines 6683-6686.
There was a problem hiding this comment.
entryblock cannot be NULL. I'll add the assert.
|
Fixes are in #25224 |
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.
Adds GEN_START bytecode to handle checking for None when starting a generator or coroutine.
This means that:
send()doesn't need to check the state of the generator.https://bugs.python.org/issue43683