set types

python · eendebakpt · Nov 8, 2024 · Nov 8, 2024 · Nov 11, 2024 · Dec 12, 2024
commit 17100c09debfa6aadc1ac5e747aa16a96688c74c
diff --git a/Include/internal/pycore_freelist.h b/Include/internal/pycore_freelist.h
@@ -40,6 +40,7 @@ _Py_freelists_GET(void)
 #define _Py_FREELIST_POP(TYPE, NAME) \
     _Py_CAST(TYPE*, _PyFreeList_Pop(&_Py_freelists_GET()->NAME))
 
+
 // Pops a non-PyObject data structure from the freelist, returns NULL if the
 // freelist is empty.
 #define _Py_FREELIST_POP_MEM(NAME) \

@@ -17,7 +17,7 @@ extern "C" {
 #  define Py_ints_MAXFREELIST 100
 #  define Py_slices_MAXFREELIST 1
 #  define Py_ranges_MAXFREELIST 10
-#  define Py_rangeiters_MAXFREELIST 10
+#  define Py_shared_iters_MAXFREELIST 24
 #  define Py_contexts_MAXFREELIST 255
 #  define Py_async_gens_MAXFREELIST 80
 #  define Py_async_gen_asends_MAXFREELIST 80
@@ -45,7 +45,7 @@ struct _Py_freelists {
     struct _Py_freelist dictkeys;
     struct _Py_freelist slices;
     struct _Py_freelist ranges;
-    struct _Py_freelist rangeiters;
+    struct _Py_freelist shared_iters;
     struct _Py_freelist contexts;
     struct _Py_freelist async_gens;
     struct _Py_freelist async_gen_asends;

diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -3910,15 +3910,19 @@ PyTypeObject PyListIter_Type = {
 static PyObject *
 list_iter(PyObject *seq)
 {
-    _PyListIterObject *it;
-
     if (!PyList_Check(seq)) {
         PyErr_BadInternalCall();
         return NULL;
     }
-    it = PyObject_GC_New(_PyListIterObject, &PyListIter_Type);
-    if (it == NULL)
-        return NULL;
+    _PyListIterObject *it = _Py_FREELIST_POP(_PyListIterObject, shared_iters);
+    if (it == NULL) {
+        it = PyObject_GC_New(_PyListIterObject, &PyListIter_Type);
+        if (it == NULL) {
+            return NULL;
+        }
+    } else {
+        Py_SET_TYPE(it, &PyListIter_Type);
+    }
     it->it_index = 0;
     it->it_seq = (PyListObject *)Py_NewRef(seq);
     _PyObject_GC_TRACK(it);
@@ -3931,7 +3935,7 @@ listiter_dealloc(PyObject *self)
     _PyListIterObject *it = (_PyListIterObject *)self;
     _PyObject_GC_UNTRACK(it);
     Py_XDECREF(it->it_seq);
-    PyObject_GC_Del(it);
+    _Py_FREELIST_FREE(shared_iters, it, PyObject_GC_Del);
 }
 
 static int

diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
@@ -886,7 +886,7 @@ rangeiter_setstate(_PyRangeIterObject *r, PyObject *state)
 static void
 rangeiter_dealloc(_PyRangeIterObject *r)
 {
-    _Py_FREELIST_FREE(rangeiters, r, PyObject_Free);
+    _Py_FREELIST_FREE(shared_iters, r, PyObject_Free);
 }
 
 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
@@ -969,12 +969,15 @@ get_len_of_range(long lo, long hi, long step)
 static PyObject *
 fast_range_iter(long start, long stop, long step, long len)
 {
-    _PyRangeIterObject *it = _Py_FREELIST_POP(_PyRangeIterObject, rangeiters);
+    _PyRangeIterObject *it = _Py_FREELIST_POP(_PyRangeIterObject, shared_iters);
     if (it == NULL) {
         it = PyObject_New(_PyRangeIterObject, &PyRangeIter_Type);
         if (it == NULL)
             return NULL;
     }
+    else {
+        Py_SET_TYPE(it, &PyRangeIter_Type);
+    }
     it->start = start;
     it->step = step;
     it->len = len;

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -994,7 +994,8 @@ tupleiter_dealloc(_PyTupleIterObject *it)
 {
     _PyObject_GC_UNTRACK(it);
     Py_XDECREF(it->it_seq);
-    PyObject_GC_Del(it);
+    assert(sizeof(_PyTupleIterObject)==sizeof(_PyListIterObject));
+    _Py_FREELIST_FREE(shared_iters, it, PyObject_GC_Del);
 }
 
 static int
@@ -1122,9 +1123,15 @@ tuple_iter(PyObject *seq)
         PyErr_BadInternalCall();
         return NULL;
     }
-    it = PyObject_GC_New(_PyTupleIterObject, &PyTupleIter_Type);
-    if (it == NULL)
-        return NULL;
+    it = _Py_FREELIST_POP(_PyTupleIterObject, shared_iters);
+
+    if (it == NULL) {
+        it = PyObject_GC_New(_PyTupleIterObject, &PyTupleIter_Type);
+        if (it == NULL)
+            return NULL;
+    } else {
+        Py_SET_TYPE(it, &PyTupleIter_Type);
+    }
     it->it_index = 0;
     it->it_seq = (PyTupleObject *)Py_NewRef(seq);
     _PyObject_GC_TRACK(it);

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -6,6 +6,7 @@
 #include "pycore_code.h"          // CO_FAST_FREE
 #include "pycore_dict.h"          // _PyDict_KeysSize()
 #include "pycore_frame.h"         // _PyInterpreterFrame
+#include "pycore_freelist.h"      // _Py_FREELIST_FREE(), _Py_FREELIST_POP()
 #include "pycore_lock.h"          // _PySeqLock_*
 #include "pycore_long.h"          // _PyLong_IsNegative(), _PyLong_GetOne()
 #include "pycore_memoryobject.h"  // _PyMemoryView_FromBufferProc()