Make more list and tuple functions public

msimacek · msimacek · commit 26e7584bf987 · 2025-07-22T15:07:16.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/abstract.h b/graalpython/com.oracle.graal.python.cext/include/abstract.h
@@ -755,13 +755,12 @@ PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
 #define PySequence_Fast_GET_ITEM(o, i)\
      (PyList_Check(o) ? PyList_GET_ITEM((o), (i)) : PyTuple_GET_ITEM((o), (i)))
 
-// GraalPy-specific
-PyAPI_FUNC(PyObject **) GraalPyPrivate_Sequence_Fast_ITEMS(PyObject *o);
-
 /* Return a pointer to the underlying item array for
    an object returned by PySequence_Fast */
 // GraalPy change
-#define PySequence_Fast_ITEMS(sf) GraalPyPrivate_Sequence_Fast_ITEMS(sf)
+#define PySequence_Fast_ITEMS(sf) \
+    (PyList_Check(sf) ? GraalPyList_ITEMS(_PyObject_CAST((sf))) \
+                      : GraalPyTuple_ITEMS(_PyObject_CAST((sf))))
 
 /* Return the number of occurrences on value on 'o', that is, return
    the number of keys for which o[key] == value.
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/listobject.h b/graalpython/com.oracle.graal.python.cext/include/cpython/listobject.h
@@ -43,12 +43,13 @@ static inline Py_ssize_t PyList_GET_SIZE(PyObject *op) {
 
 #define PyList_GET_ITEM(op, index) (PyList_GetItem((PyObject*)(op), (index)))
 
-// GraalPy-specific
-PyAPI_FUNC(PyObject **) GraalPyPrivate_List_GetItems(PyObject *op);
+// GraalPy public API to replace direct access to ob_item
+PyAPI_FUNC(PyObject **) GraalPyList_ITEMS(PyObject *op);
+PyAPI_FUNC(void) GraalPyList_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c);
 
 static inline void
 PyList_SET_ITEM(PyObject *op, Py_ssize_t index, PyObject *value) {
-    GraalPyPrivate_List_GetItems(op)[index] = value;
+    GraalPyList_SET_ITEM(op, index, value);
 }
 #define PyList_SET_ITEM(op, index, value) \
     PyList_SET_ITEM(_PyObject_CAST(op), (index), _PyObject_CAST(value))
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h b/graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h
@@ -31,20 +31,19 @@ static inline Py_ssize_t PyTuple_GET_SIZE(PyObject *op) {
 }
 #define PyTuple_GET_SIZE(op) PyTuple_GET_SIZE(_PyObject_CAST(op))
 
-PyAPI_FUNC(PyObject *) _PyTuple_GET_ITEM(PyObject *, Py_ssize_t);
-#define PyTuple_GET_ITEM(op, index) _PyTuple_GET_ITEM(_PyObject_CAST(op), (index))
+#define PyTuple_GET_ITEM(op, index) GraalPyTuple_GET_ITEM(_PyObject_CAST(op), (index))
 
-// GraalPy-specific
-PyAPI_FUNC(PyObject **) GraalPyPrivate_Tuple_GetItems(PyObject *op);
+// GraalPy public API to avoid direct access to ob_item
+PyAPI_FUNC(PyObject **) GraalPyTuple_ITEMS(PyObject *op);
+PyAPI_FUNC(PyObject *) GraalPyTuple_GET_ITEM(PyObject *, Py_ssize_t);
+PyAPI_FUNC(void) GraalPyTuple_SET_ITEM(PyObject*, Py_ssize_t, PyObject*);
 
-// GraalPy change: Export PyTuple_SET_ITEM as regular API function to use in PyO3 and others
-PyAPI_FUNC(void) PyTuple_SET_ITEM(PyObject*, Py_ssize_t, PyObject*);
-
-/* Inline function to be used in the PyTuple_SET_ITEM macro. */
-static inline void graalpy_tuple_set_item(PyObject *op, Py_ssize_t index, PyObject *value) {
-    GraalPyPrivate_Tuple_GetItems(op)[index] = value;
+/* Function *only* to be used to fill in brand new tuples */
+static inline void
+PyTuple_SET_ITEM(PyObject *op, Py_ssize_t index, PyObject *value) {
+    GraalPyTuple_SET_ITEM(op, index, value);
 }
 #define PyTuple_SET_ITEM(op, index, value) \
-    graalpy_tuple_set_item(_PyObject_CAST(op), (index), _PyObject_CAST(value))
+    PyTuple_SET_ITEM(_PyObject_CAST(op), (index), _PyObject_CAST(value))
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
diff --git a/graalpython/com.oracle.graal.python.cext/include/internal/pycore_tuple.h b/graalpython/com.oracle.graal.python.cext/include/internal/pycore_tuple.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -66,7 +66,7 @@ struct _Py_tuple_state {
 #endif
 };
 
-#define _PyTuple_ITEMS(op) (PySequence_Fast_ITEMS(op))
+#define _PyTuple_ITEMS(op) (GraalPyTuple_ITEMS(op))
 
 extern PyObject *_PyTuple_FromArray(PyObject *const *, Py_ssize_t);
 extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);
diff --git a/graalpython/com.oracle.graal.python.cext/modules/_sqlite/clinic/connection.c.h b/graalpython/com.oracle.graal.python.cext/modules/_sqlite/clinic/connection.c.h
@@ -60,7 +60,7 @@ pysqlite_connection_init(PyObject *self, PyObject *args, PyObject *kwargs)
     int uri = 0;
     enum autocommit_mode autocommit = LEGACY_TRANSACTION_CONTROL;
 
-    fastargs = _PyArg_UnpackKeywords(PySequence_Fast_ITEMS(args), nargs, kwargs, NULL, &_parser, 1, 8, 0, argsbuf);
+    fastargs = _PyArg_UnpackKeywords(GraalPyTuple_ITEMS(args), nargs, kwargs, NULL, &_parser, 1, 8, 0, argsbuf);
     if (!fastargs) {
         goto exit;
     }
diff --git a/graalpython/com.oracle.graal.python.cext/modules/clinic/sha3module.c.h b/graalpython/com.oracle.graal.python.cext/modules/clinic/sha3module.c.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2024, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2024 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -59,7 +59,7 @@ py_sha3_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
     PyObject *data = NULL;
     int usedforsecurity = 1;
 
-    fastargs = _PyArg_UnpackKeywords(PySequence_Fast_ITEMS(args), nargs, kwargs, NULL, &_parser, 0, 1, 0, argsbuf);
+    fastargs = _PyArg_UnpackKeywords(GraalPyTuple_ITEMS(args), nargs, kwargs, NULL, &_parser, 0, 1, 0, argsbuf);
     if (!fastargs) {
         goto exit;
     }
diff --git a/graalpython/com.oracle.graal.python.cext/src/abstract.c b/graalpython/com.oracle.graal.python.cext/src/abstract.c
@@ -3044,15 +3044,6 @@ _Py_FreeCharPArray(char *const array[])
 #endif // GraalPy change
 
 // GraalPy additions
-PyObject **
-GraalPyPrivate_Sequence_Fast_ITEMS(PyObject *o)
-{
-    if (PyTuple_Check(o)) {
-        return GraalPyPrivate_Tuple_GetItems(o);
-    } else {
-        return GraalPyPrivate_List_GetItems(o);
-    }
-}
 
 PyObject*
 GraalPyPrivate_Sequence_ITEM(PyObject* obj, Py_ssize_t index)
diff --git a/graalpython/com.oracle.graal.python.cext/src/listobject.c b/graalpython/com.oracle.graal.python.cext/src/listobject.c
@@ -131,9 +131,13 @@ PyTypeObject PyList_Type = {
     .tp_vectorcall = 0, // GraalPy change: nulled
 };
 
-// alias for internal function, currently used in PyO3
+void GraalPyList_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {
+    GraalPyList_ITEMS(op)[index] = value;
+}
+
+// deprecated alias for internal function, currently used in PyO3
 PyAPI_FUNC(void) _PyList_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
-    PyList_SET_ITEM(a, b, c);
+    GraalPyList_SET_ITEM(a, b, c);
 }
 
 static inline int
@@ -166,14 +170,14 @@ PyList_SetItem(PyObject *op, Py_ssize_t i,
         return -1;
     }
     // GraalPy change: avoid direct struct access
-    p = GraalPyPrivate_List_GetItems(op) + i;
+    p = GraalPyList_ITEMS(op) + i;
     Py_XSETREF(*p, newitem);
     return 0;
 }
 
 // GraalPy-additions
 PyObject **
-GraalPyPrivate_List_GetItems(PyObject *op)
+GraalPyList_ITEMS(PyObject *op)
 {
     return GraalPyPrivate_GET_PyListObject_ob_item(op);
 }
diff --git a/graalpython/com.oracle.graal.python.cext/src/tupleobject.c b/graalpython/com.oracle.graal.python.cext/src/tupleobject.c
@@ -152,7 +152,7 @@ PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem)
         return -1;
     }
     // GraalPy change: avoid direct struct access
-    p = GraalPyPrivate_Tuple_GetItems(op) + i;
+    p = GraalPyTuple_ITEMS(op) + i;
     Py_XSETREF(*p, newitem);
     return 0;
 }
@@ -1367,7 +1367,7 @@ void GraalPyPrivate_Tuple_Dealloc(PyTupleObject* self) {
 }
 
 PyObject **
-GraalPyPrivate_Tuple_GetItems(PyObject *op)
+GraalPyTuple_ITEMS(PyObject *op)
 {
     PyObject **ob_item;
     if (points_to_py_handle_space(op)) {
@@ -1391,16 +1391,14 @@ GraalPyPrivate_Tuple_GetItems(PyObject *op)
  * PyTuple_GET_ITEM.
  */
 PyObject*
-_PyTuple_GET_ITEM(PyObject* a, Py_ssize_t b) {
-    PyObject **ob_item = GraalPyPrivate_Tuple_GetItems(a);
+GraalPyTuple_GET_ITEM(PyObject* a, Py_ssize_t b) {
+    PyObject **ob_item = GraalPyTuple_ITEMS(a);
     if (ob_item) {
         return ob_item[b];
     }
     return NULL; // an exception has happend during transtion
 }
 
-#undef PyTuple_SET_ITEM
-// Export PyTuple_SET_ITEM as regular API function to use in PyO3 and others
-void PyTuple_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {
-    graalpy_tuple_set_item(op, index, value);
+void GraalPyTuple_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {
+    GraalPyTuple_ITEMS(op)[index] = value;
 }
diff --git a/graalpython/lib-graalpython/patches/nanobind.patch b/graalpython/lib-graalpython/patches/nanobind.patch
@@ -905,11 +905,10 @@ index 0000000..b61486b
 +-U __Py_SwappedOp
 +-U __Py_TrueStruct
 +-U __Py_VaBuildValue_SizeT
-+-U GraalPyPrivate_List_GetItems
-+-U GraalPyPrivate_Sequence_Fast_ITEMS
-+-U GraalPyPrivate_Tuple_GetItems
++-U GraalPyList_ITEMS
++-U GraalPyTuple_ITEMS
 +-U GraalPyPrivate_SIZE
-+-U __PyTuple_GET_ITEM
++-U GraalPyTuple_GET_ITEM
 +-U __Py_EllipsisObjectReference
 +-U __Py_FalseStructReference
 +-U __Py_NoneStructReference

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ pysqlite_connection_init(PyObject self, PyObject args, PyObject *kwargs)`
`60`	`60`	`int uri = 0;`
`61`	`61`	`enum autocommit_mode autocommit = LEGACY_TRANSACTION_CONTROL;`
`62`	`62`
`63`		`- fastargs = _PyArg_UnpackKeywords(PySequence_Fast_ITEMS(args), nargs, kwargs, NULL, &_parser, 1, 8, 0, argsbuf);`
	`63`	`+ fastargs = _PyArg_UnpackKeywords(GraalPyTuple_ITEMS(args), nargs, kwargs, NULL, &_parser, 1, 8, 0, argsbuf);`
`64`	`64`	`if (!fastargs) {`
`65`	`65`	`goto exit;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2024, Oracle and/or its affiliates.`
	`1`	`+/* Copyright (c) 2024, 2025, Oracle and/or its affiliates.`
`2`	`2`	`* Copyright (C) 1996-2024 Python Software Foundation`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2`
`@@ -59,7 +59,7 @@ py_sha3_new(PyTypeObject type, PyObject args, PyObject *kwargs)`
`59`	`59`	`PyObject *data = NULL;`
`60`	`60`	`int usedforsecurity = 1;`
`61`	`61`
`62`		`- fastargs = _PyArg_UnpackKeywords(PySequence_Fast_ITEMS(args), nargs, kwargs, NULL, &_parser, 0, 1, 0, argsbuf);`
	`62`	`+ fastargs = _PyArg_UnpackKeywords(GraalPyTuple_ITEMS(args), nargs, kwargs, NULL, &_parser, 0, 1, 0, argsbuf);`
`63`	`63`	`if (!fastargs) {`
`64`	`64`	`goto exit;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,13 @@ PyTypeObject PyList_Type = {`
`131`	`131`	`.tp_vectorcall = 0, // GraalPy change: nulled`
`132`	`132`	`};`
`133`	`133`
`134`		`-// alias for internal function, currently used in PyO3`
	`134`	`+void GraalPyList_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {`
	`135`	`+ GraalPyList_ITEMS(op)[index] = value;`
	`136`	`+}`
	`137`	`+`
	`138`	`+// deprecated alias for internal function, currently used in PyO3`
`135`	`139`	`PyAPI_FUNC(void) _PyList_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {`
`136`		`- PyList_SET_ITEM(a, b, c);`
	`140`	`+ GraalPyList_SET_ITEM(a, b, c);`
`137`	`141`	`}`
`138`	`142`
`139`	`143`	`static inline int`
`@@ -166,14 +170,14 @@ PyList_SetItem(PyObject *op, Py_ssize_t i,`
`166`	`170`	`return -1;`
`167`	`171`	`}`
`168`	`172`	`// GraalPy change: avoid direct struct access`
`169`		`- p = GraalPyPrivate_List_GetItems(op) + i;`
	`173`	`+ p = GraalPyList_ITEMS(op) + i;`
`170`	`174`	`Py_XSETREF(*p, newitem);`
`171`	`175`	`return 0;`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`// GraalPy-additions`
`175`	`179`	`PyObject **`
`176`		`-GraalPyPrivate_List_GetItems(PyObject *op)`
	`180`	`+GraalPyList_ITEMS(PyObject *op)`
`177`	`181`	`{`
`178`	`182`	`return GraalPyPrivate_GET_PyListObject_ob_item(op);`
`179`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ PyTuple_SetItem(PyObject op, Py_ssize_t i, PyObject newitem)`
`152`	`152`	`return -1;`
`153`	`153`	`}`
`154`	`154`	`// GraalPy change: avoid direct struct access`
`155`		`- p = GraalPyPrivate_Tuple_GetItems(op) + i;`
	`155`	`+ p = GraalPyTuple_ITEMS(op) + i;`
`156`	`156`	`Py_XSETREF(*p, newitem);`
`157`	`157`	`return 0;`
`158`	`158`	`}`
`@@ -1367,7 +1367,7 @@ void GraalPyPrivate_Tuple_Dealloc(PyTupleObject* self) {`
`1367`	`1367`	`}`
`1368`	`1368`
`1369`	`1369`	`PyObject **`
`1370`		`-GraalPyPrivate_Tuple_GetItems(PyObject *op)`
	`1370`	`+GraalPyTuple_ITEMS(PyObject *op)`
`1371`	`1371`	`{`
`1372`	`1372`	`PyObject **ob_item;`
`1373`	`1373`	`if (points_to_py_handle_space(op)) {`
`@@ -1391,16 +1391,14 @@ GraalPyPrivate_Tuple_GetItems(PyObject *op)`
`1391`	`1391`	`* PyTuple_GET_ITEM.`
`1392`	`1392`	`*/`
`1393`	`1393`	`PyObject*`
`1394`		`-_PyTuple_GET_ITEM(PyObject* a, Py_ssize_t b) {`
`1395`		`- PyObject **ob_item = GraalPyPrivate_Tuple_GetItems(a);`
	`1394`	`+GraalPyTuple_GET_ITEM(PyObject* a, Py_ssize_t b) {`
	`1395`	`+ PyObject **ob_item = GraalPyTuple_ITEMS(a);`
`1396`	`1396`	`if (ob_item) {`
`1397`	`1397`	`return ob_item[b];`
`1398`	`1398`	`}`
`1399`	`1399`	`return NULL; // an exception has happend during transtion`
`1400`	`1400`	`}`
`1401`	`1401`
`1402`		`-#undef PyTuple_SET_ITEM`
`1403`		`-// Export PyTuple_SET_ITEM as regular API function to use in PyO3 and others`
`1404`		`-void PyTuple_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {`
`1405`		`- graalpy_tuple_set_item(op, index, value);`
	`1402`	`+void GraalPyTuple_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {`
	`1403`	`+ GraalPyTuple_ITEMS(op)[index] = value;`
`1406`	`1404`	`}`