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 2 commits into
base: main
Choose a base branch
from
+7 −2
Open

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 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
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
1 change: 1 addition & 0 deletions Include/cpython/pystats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ typedef struct _optimization_stats {
uint64_t jit_code_size;
uint64_t jit_trampoline_size;
uint64_t jit_data_size;
uint64_t jit_got_size;
Copy link
Copy Markdown
Contributor

@diegorusso diegorusso Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, thanks! :)

uint64_t jit_padding_size;
uint64_t jit_freed_memory_size;
uint64_t trace_total_memory_hist[_Py_UOP_HIST_SIZE];
Expand Down
3 changes: 3 additions & 0 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,9 @@ static int
is_terminator(const _PyUOpInstruction *uop)
{
int opcode = _PyUop_Uncached[uop->opcode];
if (opcode == 0) {
Copy link
Copy Markdown
Member

@markshannon markshannon Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should remove the line int opcode = _PyUop_Uncached[uop->opcode]; as the only time we should see a TOS caching uop is in the sanity_check function.

Maybe move that line there, and just assert(opcode <= MAX_UOP_ID) here?

opcode = uop->opcode;
}
return (
opcode == _EXIT_TRACE ||
opcode == _DEOPT ||
Expand Down
Loading