Skip to content

[3.11] GH-93516: Backport GH-93769 #94231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 6 commits into from
Jun 28, 2022
Merged

[3.11] GH-93516: Backport GH-93769 #94231

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a8e2fa
Store offset of first traceable instruction to avoid having to recomp…
markshannon Jun 13, 2022
71dd6c8
Hardcode RESUME opcode in deepfreeze, to break dependency on exact ve…
markshannon Jun 13, 2022
588d5fe
Handle empty code objects, and other invalid code, gracefully.
markshannon Jun 13, 2022
643a614
Check bounds before data
markshannon Jun 14, 2022
fe6a1d3
Assert that _co_firsttraceable is a RESUME
markshannon Jun 28, 2022
a0ced71
Regen ABI doc.
markshannon Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Assert that _co_firsttraceable is a RESUME
  • Loading branch information
@markshannon
markshannon committed Jun 28, 2022
commit fe6a1d3ce5d81d41635ad4dab4577d14cd8f98a9
4 changes: 4 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5611,6 +5611,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
if (tstate->tracing == 0 &&
INSTR_OFFSET() >= frame->f_code->_co_firsttraceable
) {
assert(
_PyOpcode_Deopt[first_instr[frame->f_code->_co_firsttraceable]]
== RESUME
);
int instr_prev = _PyInterpreterFrame_LASTI(frame);
frame->prev_instr = next_instr;
TRACING_NEXTOPARG();
Expand Down