Skip to content

gh-143123: Protect against recursive tracer calls/finalization #143126

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
Fidget-Spinner wants to merge 6 commits into
base: main
Choose a base branch
from
+7 −4
Open

gh-143123: Protect against recursive tracer calls/finalization #143126

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1303cf0
Protect against re-entrant tracer calls
Fidget-Spinner Dec 23, 2025
9f5f8b5
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 23, 2025
cdb5d46
Stronger check for recursive traces
Fidget-Spinner Dec 25, 2025
4e216fe
fix crash
Fidget-Spinner Dec 25, 2025
ba708ca
remove misleading comment
Fidget-Spinner Dec 29, 2025
0db663d
Merge remote-tracking branch 'upstream/main' into tidy-jit-invariants
Fidget-Spinner Dec 29, 2025
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 Misc/NEWS.d/next/Core_and_Builtins/2025-12-23-23-36-41.gh-issue-143123.-51gt_.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Protect the JIT against recursive tracing.
6 changes: 6 additions & 0 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ _PyOptimizer_Optimize(
// return immediately without optimization.
return 0;
}
if (_tstate->jit_tracer_state.initial_state.func == NULL) {
Copy link
Member

@markshannon markshannon Dec 24, 2025

Choose a reason for hiding this comment

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

We shouldn't be able to get into this state, should we?
This seems like it should be an assert and the fix should be elsewhere.

// gh-143123: It is possible for another function to finalize the current
Copy link
Member

@markshannon markshannon Dec 24, 2025

Choose a reason for hiding this comment

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

What do you mean by "another function"? Which other function?

// tracer's state while tracing. This might happen in a
// Python -> C -> Python call.
return 0;
}
assert(!interp->compiling);
assert(_tstate->jit_tracer_state.initial_state.stack_depth >= 0);
#ifndef Py_GIL_DISABLED
Expand Down
Loading