Skip to content

GH-138355: Remove trash_delete_later and trash_delete_nesting from _gc_runtime_state #138767

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
merged 4 commits into from
Sep 17, 2025
Merged

GH-138355: Remove trash_delete_later and trash_delete_nesting from _gc_runtime_state #138767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80eeee9
Remove trash_delete_later and trash_delete_nesting from _gc_runtime_s…
sergey-miryanov Sep 10, 2025
dff746f
Add comments for delete_later from _ts
sergey-miryanov Sep 10, 2025
78af3bd
Mention _PyTrash_thread_deposit_object and _PyTrash_thread_destroy_chain
sergey-miryanov Sep 17, 2025
9f027bc
Merge branch 'main' into gh-138355-remove-trash-delete-fields
sergey-miryanov Sep 17, 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
5 changes: 5 additions & 0 deletions Include/cpython/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ struct _ts {
*/
unsigned long native_thread_id;

/* List of objects that still need to be cleaned up, singly linked
* via their gc headers' gc_next pointers. The list is populated by
* _PyTrash_thread_deposit_object and cleaned up by
* _PyTrash_thread_destroy_chain.
*/
PyObject *delete_later;

/* Tagged pointer to top-most critical section, or zero if there is no
Expand Down
6 changes: 0 additions & 6 deletions Include/internal/pycore_interp_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,6 @@ enum _GCPhase {
#define NUM_GENERATIONS 3

struct _gc_runtime_state {
/* List of objects that still need to be cleaned up, singly linked
* via their gc headers' gc_prev pointers. */
PyObject *trash_delete_later;
/* Current call-stack depth of tp_dealloc calls. */
int trash_delete_nesting;

/* Is automatic collection enabled? */
int enabled;
int debug;
Expand Down
4 changes: 2 additions & 2 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3051,7 +3051,7 @@ Py_ReprLeave(PyObject *obj)

/* Trashcan support. */

/* Add op to the gcstate->trash_delete_later list. Called when the current
/* Add op to the tstate->delete_later list. Called when the current
* call-stack depth gets large. op must be a gc'ed object, with refcount 0.
* Py_DECREF must already have been called on it.
*/
Expand All @@ -3077,7 +3077,7 @@ _PyTrash_thread_deposit_object(PyThreadState *tstate, PyObject *op)
tstate->delete_later = op;
}

/* Deallocate all the objects in the gcstate->trash_delete_later list.
/* Deallocate all the objects in the tstate->delete_later list.
* Called when the call-stack unwinds again. */
void
_PyTrash_thread_destroy_chain(PyThreadState *tstate)
Expand Down
Loading