Skip to content

Don't use the trashcan for gc=False structs #369

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
jcrist merged 1 commit into from
Apr 9, 2023
Merged

Don't use the trashcan for gc=False structs #369

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
6 changes: 1 addition & 5 deletions msgspec/_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4724,14 +4724,12 @@ clear_slots(PyTypeObject *type, PyObject *self)

static void
Struct_dealloc_nogc(PyObject *self) {
Py_TRASHCAN_BEGIN(self, Struct_dealloc_nogc)

PyTypeObject *type = Py_TYPE(self);

/* Maybe call a finalizer */
if (type->tp_finalize) {
/* If resurrected, exit early */
if (PyObject_CallFinalizerFromDealloc(self) < 0) goto done;
if (PyObject_CallFinalizerFromDealloc(self) < 0) return;
}

/* Maybe clear weakrefs */
Expand All @@ -4751,8 +4749,6 @@ Struct_dealloc_nogc(PyObject *self) {
type->tp_free(self);
/* Decref the object type immediately */
Py_DECREF(type);
done:
Py_TRASHCAN_END
}

static MS_INLINE Py_ssize_t
Expand Down
3 changes: 0 additions & 3 deletions tests/test_struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,9 +1156,6 @@ def __del__(self):
@pytest.mark.parametrize("has_gc", [False, True])
def test_struct_dealloc_trashcan(self, has_gc):
N = 100
# XXX: Python <= 3.10 may run __del__ more than once for non-gc types
# if the trashcan mechanism is invoked. As such, we keep a set to track
# if it was called, not how many times it was called.
called = set()

class Node(Struct, gc=has_gc):
Expand Down