[3.12] GH-127953: Make line number lookup O(1) regardless of the size of the code object (GH-129127) #132268
+215
−122
Conversation
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
…e size of the code object (python#129127) pythonGH-127953: Make line number lookup O(1) regardless of the size of the code object (pythonGH-128350)
markshannon
changed the title
kmoffett
suggested changes
Jun 10, 2025
Comment on lines
-863
to
+881
| _PyFrame_SetStackPointer(frame, stack_pointer); | ||
| int original_opcode = _Py_call_instrumentation_line( | ||
| tstate, frame, here, prev); | ||
| stack_pointer = _PyFrame_GetStackPointer(frame); | ||
| if (original_opcode < 0) { | ||
| next_instr = here+1; | ||
| goto error; | ||
| int original_opcode = 0; | ||
| if (tstate->tracing) { | ||
| PyCodeObject *code = frame->f_code; | ||
| int index = (int)(here - _PyCode_CODE(code)); | ||
| original_opcode = code->_co_monitoring->lines->data[index*code->_co_monitoring->lines->bytes_per_entry]; | ||
| } | ||
| next_instr = frame->prev_instr; | ||
| if (next_instr != here) { | ||
| DISPATCH(); | ||
| else { | ||
| _PyFrame_SetStackPointer(frame, stack_pointer); | ||
| original_opcode = _Py_call_instrumentation_line( | ||
| tstate, frame, here, prev); | ||
| stack_pointer = _PyFrame_GetStackPointer(frame); | ||
| if (original_opcode < 0) { | ||
| next_instr = here+1; | ||
| goto error; | ||
| } | ||
| next_instr = frame->prev_instr; | ||
| if (next_instr != here) { | ||
| DISPATCH(); | ||
| } |
There was a problem hiding this comment.
This looks wrong; this isn't present in the original change, but is instead a partial backport of GH-114986
| PyCodeAddressRange range; | ||
| _PyCode_InitAddressRange(code, &range); | ||
| int max_line = code->co_firstlineno + 1; | ||
| _PyCode_InitAddressRange(code, &range); |
There was a problem hiding this comment.
This line appears to be a copy-paste error; it duplicates line 1553 above.
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.
Manual backport of #129127.
This probably isn't getting merged into 3.12 (that's up to @Yhg1s), but I wanted to make available to anyone who wants it in their 3.12