Skip to content

gh-154401: Skip fetching the thread state for non-GC types in _Py_Dealloc #154430

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

Merged
ZeroIntensity merged 1 commit into from
Jul 22, 2026
+15 −6
Merged

gh-154401: Skip fetching the thread state for non-GC types in _Py_Dealloc #154430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-07-22-14-30-00.gh-issue-154429.Qk9mZ2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Slightly speed up deallocation of objects that are not tracked by the garbage
collector, such as :class:`int`, :class:`float` and :class:`str`.
19 changes: 13 additions & 6 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3292,13 +3292,20 @@ _Py_Dealloc(PyObject *op)
PyTypeObject *type = Py_TYPE(op);
unsigned long gc_flag = type->tp_flags & Py_TPFLAGS_HAVE_GC;
destructor dealloc = type->tp_dealloc;
PyThreadState *tstate = _PyThreadState_GET();
intptr_t margin = _Py_RecursionLimit_GetMargin(tstate);
if (margin < 2 && gc_flag) {
_PyTrash_thread_deposit_object(tstate, (PyObject *)op);
return;
PyThreadState *tstate = NULL;
intptr_t margin = 0;
if (gc_flag) {
tstate = _PyThreadState_GET();
margin = _Py_RecursionLimit_GetMargin(tstate);
if (margin < 2) {
_PyTrash_thread_deposit_object(tstate, (PyObject *)op);
return;
}
}
#ifdef Py_DEBUG
if (tstate == NULL) {
tstate = _PyThreadState_GET();
}
#if !defined(Py_GIL_DISABLED) && !defined(Py_STACKREF_DEBUG)
/* This assertion doesn't hold for the free-threading build, as
* PyStackRef_CLOSE_SPECIALIZED is not implemented */
Expand Down Expand Up @@ -3340,7 +3347,7 @@ _Py_Dealloc(PyObject *op)
Py_XDECREF(old_exc);
Py_DECREF(type);
#endif
if (tstate->delete_later && margin >= 4 && gc_flag) {
if (gc_flag && tstate->delete_later && margin >= 4) {
_PyTrash_thread_destroy_chain(tstate);
}
}
Expand Down
Loading