diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-05-25 18:49:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 18:49:19 (GMT) |
| commit | 534da740a2586357d204ab5f446295b9ce220787 (patch) | |
| tree | bd8f3b3ff369512aa70f039927802140042b3a6c | |
| parent | e8d9df0089e30a06d837fa2cfbd070e01531701f (diff) | |
| download | cpython-534da740a2586357d204ab5f446295b9ce220787.zip cpython-534da740a2586357d204ab5f446295b9ce220787.tar.gz cpython-534da740a2586357d204ab5f446295b9ce220787.tar.bz2 | |
bpo-42972: Fully implement GC protocol for arraymodule types (GH-26114)
(cherry picked from commit bd404ccac0d3e8358995ac0cbeec9373bb6c4d96)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
| -rw-r--r-- | Modules/arraymodule.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index aa5886f..30fb7c9 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -661,10 +661,18 @@ ins1(arrayobject *self, Py_ssize_t where, PyObject *v) /* Methods */ +static int +array_tp_traverse(arrayobject *op, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(op)); + return 0; +} + static void array_dealloc(arrayobject *op) { PyTypeObject *tp = Py_TYPE(op); + PyObject_GC_UnTrack(op); if (op->weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) op); @@ -2820,7 +2828,7 @@ static PyType_Slot array_slots[] = { {Py_tp_getset, array_getsets}, {Py_tp_alloc, PyType_GenericAlloc}, {Py_tp_new, array_new}, - {Py_tp_free, PyObject_Del}, + {Py_tp_traverse, array_tp_traverse}, /* as sequence */ {Py_sq_length, array_length}, @@ -2848,7 +2856,7 @@ static PyType_Spec array_spec = { .name = "array.array", .basicsize = sizeof(arrayobject), .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | - Py_TPFLAGS_IMMUTABLETYPE | + Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_SEQUENCE), .slots = array_slots, }; @@ -2922,6 +2930,7 @@ arrayiter_dealloc(arrayiterobject *it) static int arrayiter_traverse(arrayiterobject *it, visitproc visit, void *arg) { + Py_VISIT(Py_TYPE(it)); Py_VISIT(it->ao); return 0; } |