Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a memory leak in the experimental Tier 2 optimizer when creating
executors. Patched by Shamil Abdulaev.
16 changes: 13 additions & 3 deletions Python/optimizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,16 @@ _PyOptimizer_Optimize(
else {
executor->vm_data.code = NULL;
}
executor->vm_data.chain_depth = chain_depth;
assert(executor->vm_data.valid);
_PyExitData *exit = _tstate->jit_tracer_state.initial_state.exit;
if (exit != NULL) {
exit->executor = executor;
} else {
// An executor inserted into the code object now has a strong reference
// to it from the code object. Thus, we don't need this reference anymore.
Py_DECREF(executor);
}
executor->vm_data.chain_depth = chain_depth;
assert(executor->vm_data.valid);
interp->compiling = false;
return 1;
#else
Expand Down Expand Up @@ -310,7 +314,13 @@ add_to_pending_deletion_list(_PyExecutorObject *self)
static void
uop_dealloc(PyObject *op) {
_PyExecutorObject *self = _PyExecutorObject_CAST(op);
_PyObject_GC_UNTRACK(self);

// Object might be already untracked if we are in a GC cycle (via tp_clear).
// Avoid double-untracking.
Copy link
Contributor

Choose a reason for hiding this comment

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

Calling uop_dealloc twice means deallocating one executor twice. It seems like we're fixing symptoms, not the root of the problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can add a TODO for now so we don’t lose track of this, but I don’t have the bandwidth at the moment to dig into the root cause and fix it properly.

if (_PyObject_GC_IS_TRACKED(self)) {
_PyObject_GC_UNTRACK(self);
}

assert(self->vm_data.code == NULL);
unlink_executor(self);
// Once unlinked it becomes impossible to invalidate an executor, so do it here.
Expand Down
Loading