Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

GH-141861: Fix TRACE_RECORD if full (GH-141959)

Browse source
This commit is contained in:
Sergey Miryanov 2025-11-26 19:32:30 +05:00 • committed by GitHub
parent 27f62eb711
commit 2ea67caf31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_sys.py
View file

@ -2254,7 +2254,7 @@ def frame_3_jit() -> None:
# 1 extra iteration for tracing. # 1 extra iteration for tracing.
for i in range(_testinternalcapi.TIER2_THRESHOLD + 2): for i in range(_testinternalcapi.TIER2_THRESHOLD + 2):
# Careful, doing this in the reverse order breaks tracing: # Careful, doing this in the reverse order breaks tracing:
expected = {enabled} and i >= _testinternalcapi.TIER2_THRESHOLD + 1 expected = {enabled} and i >= _testinternalcapi.TIER2_THRESHOLD
assert sys._jit.is_active() is expected assert sys._jit.is_active() is expected
frame_2_jit(expected) frame_2_jit(expected)
assert sys._jit.is_active() is expected assert sys._jit.is_active() is expected

4
Python/bytecodes.c
View file

@ -3018,7 +3018,7 @@ dummy_func(
goto stop_tracing; goto stop_tracing;
} }
PyCodeObject *code = _PyFrame_GetCode(frame); PyCodeObject *code = _PyFrame_GetCode(frame);
_PyExecutorObject *executor = code->co_executors->executors[this_instr->op.arg]; _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
assert(executor->vm_data.index == INSTR_OFFSET() - 1); assert(executor->vm_data.index == INSTR_OFFSET() - 1);
assert(executor->vm_data.code == code); assert(executor->vm_data.code == code);
assert(executor->vm_data.valid); assert(executor->vm_data.valid);
@ -5650,7 +5650,7 @@ dummy_func(
LEAVE_TRACING(); LEAVE_TRACING();
int err = stop_tracing_and_jit(tstate, frame); int err = stop_tracing_and_jit(tstate, frame);
ERROR_IF(err < 0); ERROR_IF(err < 0);
DISPATCH_GOTO_NON_TRACING(); DISPATCH();
} }
// Super instructions. Instruction deopted. There's a mismatch in what the stack expects // Super instructions. Instruction deopted. There's a mismatch in what the stack expects
// in the optimizer. So we have to reflect in the trace correctly. // in the optimizer. So we have to reflect in the trace correctly.

4
Python/generated_cases.c.h generated
View file

@ -5476,7 +5476,7 @@
JUMP_TO_LABEL(stop_tracing); JUMP_TO_LABEL(stop_tracing);
} }
PyCodeObject *code = _PyFrame_GetCode(frame); PyCodeObject *code = _PyFrame_GetCode(frame);
_PyExecutorObject *executor = code->co_executors->executors[this_instr->op.arg]; _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
assert(executor->vm_data.index == INSTR_OFFSET() - 1); assert(executor->vm_data.index == INSTR_OFFSET() - 1);
assert(executor->vm_data.code == code); assert(executor->vm_data.code == code);
assert(executor->vm_data.valid); assert(executor->vm_data.valid);
@ -11714,7 +11714,7 @@
if (err < 0) { if (err < 0) {
JUMP_TO_LABEL(error); JUMP_TO_LABEL(error);
} }
DISPATCH_GOTO_NON_TRACING(); DISPATCH();
} }
_PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate; _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
if ((_tstate->jit_tracer_state.prev_state.instr->op.code == CALL_LIST_APPEND && if ((_tstate->jit_tracer_state.prev_state.instr->op.code == CALL_LIST_APPEND &&