gh-118414: Fix yield assertion when tracing #118683
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
gvanrossum
approved these changes
May 7, 2024
|
Thanks for the quick review! |
SonicField
pushed a commit
to SonicField/cpython
that referenced
this pull request
May 8, 2024
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.
There is an assertion introduced in
YIELD_VALUEto check the opcode. However, when the line is being traced, the opcode would beINSTRUMENTED_LINEorINSTRUMENTED_INSTRUCTIONand_PyOpcode_Deoptwon't convert it back.We can be more precise here to get the exact base opcode of the instruction, but that would probably introduce extra code outside of the assertion (the code object and the index is needed).
I think in this case, adding the two instrumentation opcode is good enough because the assertion is well covered in non-tracing mode.
_PyEval_EvalFrameDefaultwith generators andLINE/INSTRUCTIONevent monitoring #118414