Skip to content

gh-148219: Fix JIT+pystats crash: is_terminator fails for base opcodes #148220

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

Open
eendebakpt wants to merge 5 commits into
base: main
Choose a base branch
from
+8 −2
Open

gh-148219: Fix JIT+pystats crash: is_terminator fails for base opcodes #148220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa87839
Fix JIT+pystats crash: is_terminator fails for base opcodes
eendebakpt Apr 7, 2026
301d58b
Address review: remove _PyUop_Uncached from is_terminator
eendebakpt Apr 7, 2026
0b10a9f
Wire jit_got_size into pystats print and merge
eendebakpt Apr 27, 2026
e2f55fe
Merge remote-tracking branch 'origin/main' into fix-pystats-jit-termi…
eendebakpt Apr 27, 2026
6e7eafd
Merge branch 'main' into fix-pystats-jit-terminator
eendebakpt Jun 5, 2026
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
8 changes: 6 additions & 2 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,8 @@ compute_frame_penalty(uint16_t fitness_initial)
static int
is_terminator(const _PyUOpInstruction *uop)
{
int opcode = _PyUop_Uncached[uop->opcode];
int opcode = uop->opcode;
assert(opcode <= MAX_UOP_ID);
return (
opcode == _EXIT_TRACE ||
opcode == _DEOPT ||
Expand Down Expand Up @@ -1469,7 +1470,10 @@ sanity_check(_PyExecutorObject *executor)
CHECK(inst->format == UOP_FORMAT_JUMP);
CHECK(inst->error_target < executor->code_size);
}
if (is_terminator(inst)) {
if (base_opcode == _EXIT_TRACE ||
base_opcode == _DEOPT ||
base_opcode == _JUMP_TO_TOP ||
base_opcode == _DYNAMIC_EXIT) {
ended = true;
i++;
break;
Expand Down
2 changes: 2 additions & 0 deletions Python/pystats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ print_optimization_stats(FILE *out, OptimizationStats *stats)
fprintf(out, "JIT code size: %" PRIu64 "\n", stats->jit_code_size);
fprintf(out, "JIT trampoline size: %" PRIu64 "\n", stats->jit_trampoline_size);
fprintf(out, "JIT data size: %" PRIu64 "\n", stats->jit_data_size);
fprintf(out, "JIT GOT size: %" PRIu64 "\n", stats->jit_got_size);
fprintf(out, "JIT padding size: %" PRIu64 "\n", stats->jit_padding_size);
fprintf(out, "JIT freed memory size: %" PRIu64 "\n", stats->jit_freed_memory_size);

Expand Down Expand Up @@ -480,6 +481,7 @@ merge_optimization_stats(OptimizationStats *dest, const OptimizationStats *src)
dest->jit_code_size += src->jit_code_size;
dest->jit_trampoline_size += src->jit_trampoline_size;
dest->jit_data_size += src->jit_data_size;
dest->jit_got_size += src->jit_got_size;
dest->jit_padding_size += src->jit_padding_size;
dest->jit_freed_memory_size += src->jit_freed_memory_size;

Expand Down
Loading