pythongh-101277: Add repeat type to module state

erlend-aasland · Feb 1, 2023 · b64540c · b64540c
1 parent cfa334f
commit b64540c
Showing 1 changed file with 27 additions and 46 deletions.
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
@@ -25,6 +25,7 @@ typedef struct {
     PyTypeObject *pairwise_type;
     PyTypeObject *permutations_type;
     PyTypeObject *product_type;
+    PyTypeObject *repeat_type;
     PyTypeObject *starmap_type;
     PyTypeObject *takewhile_type;
     PyTypeObject *ziplongest_type;
@@ -4261,8 +4262,6 @@ typedef struct {
     Py_ssize_t cnt;
 } repeatobject;
 
-static PyTypeObject repeat_type;
-
 static PyObject *
 repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
@@ -4292,14 +4291,17 @@ repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static void
 repeat_dealloc(repeatobject *ro)
 {
+    PyTypeObject *tp = Py_TYPE(ro);
     PyObject_GC_UnTrack(ro);
     Py_XDECREF(ro->element);
-    Py_TYPE(ro)->tp_free(ro);
+    tp->tp_free(ro);
+    Py_DECREF(tp);
 }
 
 static int
 repeat_traverse(repeatobject *ro, visitproc visit, void *arg)
 {
+    Py_VISIT(Py_TYPE(ro));
     Py_VISIT(ro->element);
     return 0;
 }
@@ -4361,48 +4363,25 @@ PyDoc_STRVAR(repeat_doc,
 for the specified number of times.  If not specified, returns the object\n\
 endlessly.");
 
-static PyTypeObject repeat_type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "itertools.repeat",                 /* tp_name */
-    sizeof(repeatobject),               /* tp_basicsize */
-    0,                                  /* tp_itemsize */
-    /* methods */
-    (destructor)repeat_dealloc,         /* tp_dealloc */
-    0,                                  /* tp_vectorcall_offset */
-    0,                                  /* tp_getattr */
-    0,                                  /* tp_setattr */
-    0,                                  /* tp_as_async */
-    (reprfunc)repeat_repr,              /* tp_repr */
-    0,                                  /* tp_as_number */
-    0,                                  /* tp_as_sequence */
-    0,                                  /* tp_as_mapping */
-    0,                                  /* tp_hash */
-    0,                                  /* tp_call */
-    0,                                  /* tp_str */
-    PyObject_GenericGetAttr,            /* tp_getattro */
-    0,                                  /* tp_setattro */
-    0,                                  /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
-        Py_TPFLAGS_BASETYPE,            /* tp_flags */
-    repeat_doc,                         /* tp_doc */
-    (traverseproc)repeat_traverse,      /* tp_traverse */
-    0,                                  /* tp_clear */
-    0,                                  /* tp_richcompare */
-    0,                                  /* tp_weaklistoffset */
-    PyObject_SelfIter,                  /* tp_iter */
-    (iternextfunc)repeat_next,          /* tp_iternext */
-    repeat_methods,                     /* tp_methods */
-    0,                                  /* tp_members */
-    0,                                  /* tp_getset */
-    0,                                  /* tp_base */
-    0,                                  /* tp_dict */
-    0,                                  /* tp_descr_get */
-    0,                                  /* tp_descr_set */
-    0,                                  /* tp_dictoffset */
-    0,                                  /* tp_init */
-    0,                                  /* tp_alloc */
-    repeat_new,                         /* tp_new */
-    PyObject_GC_Del,                    /* tp_free */
+static PyType_Slot repeat_slots[] = {
+    {Py_tp_dealloc, repeat_dealloc},
+    {Py_tp_repr, repeat_repr},
+    {Py_tp_getattro, PyObject_GenericGetAttr},
+    {Py_tp_doc, (void *)repeat_doc},
+    {Py_tp_traverse, repeat_traverse},
+    {Py_tp_iter, PyObject_SelfIter},
+    {Py_tp_iternext, repeat_next},
+    {Py_tp_methods, repeat_methods},
+    {Py_tp_new, repeat_new},
+    {Py_tp_free, PyObject_GC_Del},
+    {0, NULL},
+};
+
+static PyType_Spec repeat_spec = {
+    .name = "itertools.repeat",
+    .basicsize = sizeof(repeatobject),
+    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE,
+    .slots = repeat_slots,
 };
 
 
@@ -4707,6 +4686,7 @@ itertoolsmodule_traverse(PyObject *mod, visitproc visit, void *arg)
     Py_VISIT(state->pairwise_type);
     Py_VISIT(state->permutations_type);
     Py_VISIT(state->product_type);
+    Py_VISIT(state->repeat_type);
     Py_VISIT(state->starmap_type);
     Py_VISIT(state->takewhile_type);
     Py_VISIT(state->ziplongest_type);
@@ -4730,6 +4710,7 @@ itertoolsmodule_clear(PyObject *mod)
     Py_CLEAR(state->pairwise_type);
     Py_CLEAR(state->permutations_type);
     Py_CLEAR(state->product_type);
+    Py_CLEAR(state->repeat_type);
     Py_CLEAR(state->starmap_type);
     Py_CLEAR(state->takewhile_type);
     Py_CLEAR(state->ziplongest_type);
@@ -4770,6 +4751,7 @@ itertoolsmodule_exec(PyObject *mod)
     ADD_TYPE(mod, state->pairwise_type, &pairwise_spec);
     ADD_TYPE(mod, state->permutations_type, &permutations_spec);
     ADD_TYPE(mod, state->product_type, &product_spec);
+    ADD_TYPE(mod, state->repeat_type, &repeat_spec);
     ADD_TYPE(mod, state->starmap_type, &starmap_spec);
     ADD_TYPE(mod, state->takewhile_type, &takewhile_spec);
     ADD_TYPE(mod, state->ziplongest_type, &ziplongest_spec);
@@ -4778,7 +4760,6 @@ itertoolsmodule_exec(PyObject *mod)
         &batched_type,
         &islice_type,
         &chain_type,
-        &repeat_type,
         &tee_type,
         &teedataobject_type
     };