gh-108976: Make sure instrumentation line returns the correct opcode when instruction instrumentation is stripped#109043
Closed
gaogaotiantian wants to merge 4 commits into
python:mainpython/cpython:mainfrom
gaogaotiantian:fix-instr-instrumentation-crashgaogaotiantian/cpython:fix-instr-instrumentation-crashCopy head branch name to clipboard
Closed
gh-108976: Make sure instrumentation line returns the correct opcode when instruction instrumentation is stripped#109043gaogaotiantian wants to merge 4 commits intopython:mainpython/cpython:mainfrom gaogaotiantian:fix-instr-instrumentation-crashgaogaotiantian/cpython:fix-instr-instrumentation-crashCopy head branch name to clipboard
gaogaotiantian wants to merge 4 commits into
python:mainpython/cpython:mainfrom
gaogaotiantian:fix-instr-instrumentation-crashgaogaotiantian/cpython:fix-instr-instrumentation-crashCopy head branch name to clipboard
Conversation
if trace is turned off in the trace function
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
2 participants
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.
_Py_call_instrumentation_linecurently tries to get the original opcode before executing the trace function. The opcode can beINSTRUMENT_INSTRUCTIONif instruction event is set. However, the trace function/monitoring callbacks can turn off the instruction event inside the function, which would invalidate the orignal opcode.line_data->original_opcodewon't help in this case as it will still storeINSTRUMENT_INSTRUCTION- it won't be refreshed. So, in this case, we use the opcode directly if INSTRUCTION event is turned off on the code object entirely.