GH-106581: Fix instrumentation in tier 2 - #108493
Merged
brandtbucher merged 3 commits intoAug 25, 2023
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
gvanrossum
approved these changes
Aug 25, 2023
Comment thread
Python/bytecodes.c
Outdated
| if (_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version) { | ||
| int err = _Py_Instrument(_PyFrame_GetCode(frame), tstate->interp); | ||
| ERROR_IF(err, error); | ||
| #if TIER_ONE |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
I'd indent the #if etc. to align with the code it guards (we're using a different style here than elsewhere).
Sorry, something went wrong.
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
Reviewers
Assignees
3 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.
RESUME is currently written in a way that ignores changes in tracing events when running in our tier two executor. This can manifest itself as assertion errors on debug builds and missing/extra events on release builds when changing events just before an inlined call:
This PR modifies RESUME to detect this condition and deoptimize back to tier one in these cases.