Skip to content

gh-120501: Fix reference leak in JIT build #120649

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

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

gh-120501: Fix reference leak in JIT build #120649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
871dc4c
First try to fix..
Eclips4 Jun 17, 2024
08c26d3
Forgot to commit codeobject.c
Eclips4 Jun 17, 2024
e9301f3
Merge branch 'main' into issue-120501
Eclips4 Jun 23, 2024
08cb747
Add a newline
Eclips4 Jun 23, 2024
9926e1c
Add a newline (2)
Eclips4 Jun 23, 2024
1874cf1
Resolve merge conflict
Eclips4 Aug 21, 2024
326401b
Clear child executors from side exits
Eclips4 Oct 25, 2024
f18739b
Merge branch 'main' into issue-120501
Eclips4 Oct 25, 2024
45e0c3a
Merge branch 'main' into issue-120501
Eclips4 Jan 9, 2025
a7957fa
Remove unnecessary decref
Eclips4 Jan 12, 2025
7d90844
Fix incorrect conversion specifier
Eclips4 Jan 12, 2025
f2cb39d
Steal reference instead of increfing
Eclips4 Jan 14, 2025
09f7314
Revert changes because counter optimizer has been removed
Eclips4 Jan 20, 2025
7d291ae
Merge branch 'main' into issue-120501
Eclips4 Jan 20, 2025
b10a0c9
Revert unnecessary changes
Eclips4 Jan 20, 2025
cc17195
Merge branch 'main' into issue-120501
Eclips4 Apr 13, 2025
7ef5009
Resolve merge conflict
Eclips4 Apr 13, 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 Include/internal/pycore_optimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ PyAPI_FUNC(_PyExecutorObject*) _Py_GetExecutor(PyCodeObject *code, int offset);

void _Py_ExecutorInit(_PyExecutorObject *, const _PyBloomFilter *);
void _Py_ExecutorDetach(_PyExecutorObject *);
int _Py_ExecutorClear(PyObject *);
void _Py_BloomFilter_Init(_PyBloomFilter *);
void _Py_BloomFilter_Add(_PyBloomFilter *bloom, void *obj);
PyAPI_FUNC(void) _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj);
Expand Down
2 changes: 1 addition & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,7 @@ clear_executors(PyCodeObject *co)
assert(co->co_executors);
for (int i = 0; i < co->co_executors->size; i++) {
if (co->co_executors->executors[i]) {
_Py_ExecutorDetach(co->co_executors->executors[i]);
_Py_ExecutorClear(co->co_executors->executors[i]);
assert(co->co_executors->executors[i] == NULL);
}
}
Expand Down
14 changes: 12 additions & 2 deletions Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ uop_dealloc(PyObject *op) {
_PyObject_GC_UNTRACK(self);
assert(self->vm_data.code == NULL);
unlink_executor(self);
for (uint32_t i = 0; i < self->exit_count; i++) {
self->exits[i].temperature = initial_unreachable_backoff_counter();
Py_CLEAR(self->exits[i].executor);
}
#ifdef _Py_JIT
_PyJIT_Free(self);
#endif
Expand Down Expand Up @@ -1424,8 +1428,8 @@ _Py_ExecutorDetach(_PyExecutorObject *executor)
Py_DECREF(executor);
}

static int
executor_clear(PyObject *op)
int
_Py_ExecutorClear(PyObject *op)
{
_PyExecutorObject *executor = _PyExecutorObject_CAST(op);
if (!executor->vm_data.valid) {
Expand All @@ -1448,6 +1452,12 @@ executor_clear(PyObject *op)
return 0;
}

static int
executor_clear(PyObject *executor)
{
return _Py_ExecutorClear(executor);
}

void
_Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj)
{
Expand Down
Loading