gh-149498: Fix dis.FOR_ITER reporting wrong exhausted-path jump target#149503
Open
P403n1x87 wants to merge 2 commits intopython:mainfrom
Open
gh-149498: Fix dis.FOR_ITER reporting wrong exhausted-path jump target#149503P403n1x87 wants to merge 2 commits intopython:mainfrom
P403n1x87 wants to merge 2 commits intopython:mainfrom
Conversation
… target FOR_ITER uses JUMPBY(oparg + 1) at runtime, landing on POP_ITER (past END_FOR). dis was computing the target as NIP + oparg*2, landing on END_FOR instead. Add the extra 2 bytes for FOR_ITER in both _get_jump_target and ArgResolver.offset_from_jump_arg so that jump_target, findlabels, and argrepr all reflect the actual runtime behaviour.
d69d0f5 to
0d308eb
Compare
Member
|
Updating to fix some errors we introduced on the main branch. |
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.
FOR_ITERusesJUMPBY(oparg + 1)at runtime, landing onPOP_ITER(pastEND_FOR).diswas computing the target asNIP + oparg*2, landing onEND_FORinstead. Add the extra 2 bytes forFOR_ITERin both_get_jump_targetandArgResolver.offset_from_jump_argso thatjump_target,findlabels, andargreprall reflect the actual runtime behaviour.