Skip to content

GH-135106: Restrict trashcan to GC'ed objects #135682

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
markshannon merged 5 commits into from
Jun 24, 2025
Merged

GH-135106: Restrict trashcan to GC'ed objects #135682

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d81b6b
Restrict trashcan to GC'ed objects and thread the trashcan list throu…
markshannon Jun 18, 2025
f89ddfd
Go back to asserting refcnt == 0
markshannon Jun 18, 2025
7101e8f
Don't empty trashcan unless object is GC'd
markshannon Jun 19, 2025
a81bb72
Handle tp_is_gc in _PyTrash_thread_deposit_object
markshannon Jun 19, 2025
98c9efd
Tidy a bit
markshannon Jun 19, 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
Prev Previous commit
Tidy a bit
  • Loading branch information
@markshannon
markshannon committed Jun 19, 2025
commit 98c9efdd81c28a2c402f89d76ce1717eb2fe0f71
9 changes: 3 additions & 6 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3044,17 +3044,14 @@ _PyTrash_thread_deposit_object(PyThreadState *tstate, PyObject *op)
_PyObject_ASSERT(op, Py_REFCNT(op) == 0);
PyTypeObject *tp = Py_TYPE(op);
assert(tp->tp_flags & Py_TPFLAGS_HAVE_GC);
uintptr_t tagged_ptr;
int tracked = 0;
if (tp->tp_is_gc == NULL || tp->tp_is_gc(op)) {
int tracked = _PyObject_GC_IS_TRACKED(op);
tracked = _PyObject_GC_IS_TRACKED(op);
if (tracked) {
_PyObject_GC_UNTRACK(op);
}
tagged_ptr = ((uintptr_t)tstate->delete_later) | tracked;
}
else {
tagged_ptr = ((uintptr_t)tstate->delete_later);
}
uintptr_t tagged_ptr = ((uintptr_t)tstate->delete_later) | tracked;
#ifdef Py_GIL_DISABLED
op->ob_tid = tagged_ptr;
#else
Expand Down
Loading