gh-111178: Fix function signatures in tupleobject.c

Author: vstinner

Objects/tupleobject.c

@@ -181,8 +181,9 @@ PyTuple_Pack(Py_ssize_t n, ...)
 /* Methods */
 
 static void
-tupledealloc(PyTupleObject *op)
+tupledealloc(PyObject *arg)
 {
+    PyTupleObject *op = _PyTuple_CAST(arg);
     if (Py_SIZE(op) == 0) {
         /* The empty tuple is statically allocated. */
         if (op == &_Py_SINGLETON(tuple_empty)) {
@@ -316,8 +317,9 @@ tuplerepr(PyTupleObject *v)
 /* Tests have shown that it's not worth to cache the hash value, see
    https://bugs.python.org/issue9685 */
 static Py_hash_t
-tuplehash(PyTupleObject *v)
+tuplehash(PyObject *op)
 {
+    PyTupleObject *v = _PyTuple_CAST(op);
     Py_ssize_t i, len = Py_SIZE(v);
     PyObject **item = v->ob_item;
 
@@ -342,25 +344,27 @@ tuplehash(PyTupleObject *v)
 }
 
 static Py_ssize_t
-tuplelength(PyTupleObject *a)
+tuplelength(PyObject *op)
 {
+    PyTupleObject *a = _PyTuple_CAST(op);
     return Py_SIZE(a);
 }
 
 static int
-tuplecontains(PyTupleObject *a, PyObject *el)
+tuplecontains(PyObject *op, PyObject *el)
 {
-    Py_ssize_t i;
-    int cmp;
-
-    for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
+    PyTupleObject *a = _PyTuple_CAST(op);
+    int cmp = 0;
+    for (Py_ssize_t i = 0; cmp == 0 && i < Py_SIZE(a); ++i) {
         cmp = PyObject_RichCompareBool(PyTuple_GET_ITEM(a, i), el, Py_EQ);
+    }
     return cmp;
 }
 
 static PyObject *
-tupleitem(PyTupleObject *a, Py_ssize_t i)
+tupleitem(PyObject *op, Py_ssize_t i)
 {
+    PyTupleObject *a = _PyTuple_CAST(op);
     if (i < 0 || i >= Py_SIZE(a)) {
         PyErr_SetString(PyExc_IndexError, "tuple index out of range");
         return NULL;
@@ -458,12 +462,9 @@ PyTuple_GetSlice(PyObject *op, Py_ssize_t i, Py_ssize_t j)
 }
 
 static PyObject *
-tupleconcat(PyTupleObject *a, PyObject *bb)
+tupleconcat(PyObject *op, PyObject *bb)
 {
-    Py_ssize_t size;
-    Py_ssize_t i;
-    PyObject **src, **dest;
-    PyTupleObject *np;
+    PyTupleObject *a = _PyTuple_CAST(op);
     if (Py_SIZE(a) == 0 && PyTuple_CheckExact(bb)) {
         return Py_NewRef(bb);
     }
@@ -479,27 +480,30 @@ tupleconcat(PyTupleObject *a, PyObject *bb)
         return Py_NewRef(a);
     }
     assert((size_t)Py_SIZE(a) + (size_t)Py_SIZE(b) < PY_SSIZE_T_MAX);
-    size = Py_SIZE(a) + Py_SIZE(b);
+    Py_ssize_t size = Py_SIZE(a) + Py_SIZE(b);
     if (size == 0) {
         return tuple_get_empty();
     }
 
-    np = tuple_alloc(size);
+    PyTupleObject *np = tuple_alloc(size);
     if (np == NULL) {
         return NULL;
     }
-    src = a->ob_item;
-    dest = np->ob_item;
-    for (i = 0; i < Py_SIZE(a); i++) {
+
+    PyObject **src = a->ob_item;
+    PyObject **dest = np->ob_item;
+    for (Py_ssize_t i = 0; i < Py_SIZE(a); i++) {
         PyObject *v = src[i];
         dest[i] = Py_NewRef(v);
     }
+
     src = b->ob_item;
     dest = np->ob_item + Py_SIZE(a);
-    for (i = 0; i < Py_SIZE(b); i++) {
+    for (Py_ssize_t i = 0; i < Py_SIZE(b); i++) {
         PyObject *v = src[i];
         dest[i] = Py_NewRef(v);
     }
+
     _PyObject_GC_TRACK(np);
     return (PyObject *)np;
 }
@@ -621,11 +625,10 @@ tuple_count(PyTupleObject *self, PyObject *value)
 }
 
 static int
-tupletraverse(PyTupleObject *o, visitproc visit, void *arg)
+tupletraverse(PyObject *op, visitproc visit, void *arg)
 {
-    Py_ssize_t i;
-
-    for (i = Py_SIZE(o); --i >= 0; )
+    PyTupleObject *o = _PyTuple_CAST(op);
+    for (Py_ssize_t i = Py_SIZE(o); --i >= 0; )
         Py_VISIT(o->ob_item[i]);
     return 0;
 }
@@ -781,15 +784,16 @@ static PySequenceMethods tuple_as_sequence = {
 };
 
 static PyObject*
-tuplesubscript(PyTupleObject* self, PyObject* item)
+tuplesubscript(PyObject *op, PyObject* item)
 {
+    PyTupleObject *self = _PyTuple_CAST(op);
     if (_PyIndex_Check(item)) {
         Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
         if (i == -1 && PyErr_Occurred())
             return NULL;
         if (i < 0)
             i += PyTuple_GET_SIZE(self);
-        return tupleitem(self, i);
+        return tupleitem((PyObject*)self, i);
     }
     else if (PySlice_Check(item)) {
         Py_ssize_t start, stop, step, slicelength, i;