GH-111485: Increment next_instr consistently at the start of the instruction.
#111486
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
commented
Oct 30, 2023
|
|
||
| self.check_events(func, recorders = JUMP_AND_BRANCH_RECORDERS, expected = [ | ||
| ('branch', 'func', 2, 2), | ||
| ('branch', 'func', 3, 4), | ||
| ('branch', 'func', 3, 6), |
There was a problem hiding this comment.
This is now correct. See #109038 (comment)
markshannon
commented
Oct 30, 2023
| @@ -1434,7 +1436,7 @@ def func(): | |||
| ('line', 'meth', 1), | |||
| ('jump', 'func', 5, 5), | |||
| ('jump', 'func', 5, '[offset=114]'), | |||
| ('branch', 'func', '[offset=120]', '[offset=122]'), | |||
| ('branch', 'func', '[offset=120]', '[offset=124]'), | |||
7 tasks
iritkatriel
approved these changes
Oct 31, 2023
FullteaR
pushed a commit
to FullteaR/cpython
that referenced
this pull request
Nov 3, 2023
…the instruction. (pythonGH-111486)
aisk
pushed a commit
to aisk/cpython
that referenced
this pull request
Feb 11, 2024
…the instruction. (pythonGH-111486)
Glyphack
pushed a commit
to Glyphack/cpython
that referenced
this pull request
Sep 2, 2024
…the instruction. (pythonGH-111486)
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.
This PR:
next_instrcorrect at the start of the generated instruction, and (when needed) generatesthis_instrwhich points to the current instruction.this_instrvariable pointing to the instruction, andnext_instractually points to the next instruction.this_instrthroughout which means we don't need to do manual size calculations.