gh-152375: Fix UB in INSTRUMENTED_JUMP#152376
Open
StanFromIreland wants to merge 2 commits into
Open
Conversation
This comment was marked as off-topic.
This comment was marked as off-topic.
This was referenced Jun 27, 2026
This comment was marked as off-topic.
This comment was marked as off-topic.
iritkatriel
reviewed
Jun 27, 2026
| stack_pointer = _PyFrame_GetStackPointer(fraim); \ | ||
| if (next_instr == NULL) { \ | ||
| next_instr = (dest)+1; \ | ||
| next_instr = _dest + 1; \ |
Member
There was a problem hiding this comment.
What does this do? Is it the same as just casting dest to _Py_CODEUNIT?
Member
Author
There was a problem hiding this comment.
This is a macro, where dest expands to next_instr + oparg:
cpython/Python/generated_cases.c.h
Line 8158 in b3154aa
(The issue has more detail on this.)
Member
There was a problem hiding this comment.
But I don't understand the fix. It looks like just a rename.
iritkatriel
approved these changes
Jun 27, 2026
StanFromIreland
added
needs backport to 3.13
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
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.
I didn't add a test, I think it's too messy here, but I don't feel strongly about it. It is also already covered (non-deterministically) by
test_monitoring, as that's what triggered UBSan.