Skip to content

gh-157875: Fix a reference leak when rewinding JIT traces #157888

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
Wulian233 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

gh-157875: Fix a reference leak when rewinding JIT traces #157888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d0d135
gh-157875: Fix a reference leak when rewinding JIT traces
Wulian233 Sep 21, 2026
5349219
Update test_opt.py
Wulian233 Sep 21, 2026
2698b49
Update test_opt.py
Wulian233 Sep 22, 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
22 changes: 22 additions & 0 deletions Lib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6016,6 +6016,28 @@ def f1():
"""), PYTHON_JIT="1")
self.assertEqual(result[0].rc, 0, result)

def test_157875_rewound_trace_reference_leak(self):

@johng johng Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should this test assert that the rewinding happened? Or would that make the test too brittle?

# https://github.com/python/cpython/issues/157875
import weakref

def run():
class C:
def __iter__(self):
return self

def __next__(self):
raise StopIteration

obj = C()
for _ in range(TIER2_THRESHOLD):
for _ in obj:
pass
return weakref.ref(C)

ref = run()
gc.collect()
self.assertIsNone(ref())

def test_144068_daemon_thread_jit_cleanup(self):
result = script_helper.run_python_until_end('-c', textwrap.dedent("""
import threading
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-09-21-16-00-00.gh-issue-157875.7Qn4Jp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a reference leak in the JIT when a trace is rewound after encountering
unsupported bytecode.

@johng johng Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

maybe just say when tracing is rewound? I think this get's triggered for standard supported JIT traces hit natural endings such as jumps

@Wulian233 Wulian233 Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It seems too detailed. We can ask others?👀

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 @@ -789,6 +789,9 @@ _PyJit_translate_single_bytecode_to_trace(
{
_PyUOpInstruction *curr = uop_buffer_last(trace);
while (curr->opcode != _SET_IP && uop_buffer_length(trace) > 2) {
if (_PyUop_Flags[curr->opcode] & HAS_RECORDS_VALUE_FLAG) {
Py_XDECREF((PyObject *)(uintptr_t)curr->operand0);

@johng johng Oct 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we now have a very similar pattern three times in this file, maybe worth seeing if it's worth to make it a common operation

@Wulian233 Wulian233 Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think it would be better to focus on the bug fix scope of this PR. However, currently the JIT has been suspended and only bug fixes are accepted

}
trace->next--;
curr = uop_buffer_last(trace);
}
Expand Down
Loading