Expose PyTuple_SET_ITEM also as API function on GraalPy

(cherry picked from commit 97fb792)

fix conflicts

Author: timfel

graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -39,14 +39,10 @@ PyAPI_FUNC(PyObject *) _PyTuple_GET_ITEM(PyObject *, Py_ssize_t);
 // GraalPy-specific
 PyAPI_FUNC(PyObject **) PyTruffleTuple_GetItems(PyObject *op);
 
-/* 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) {
-    PyTruffleTuple_GetItems(op)[index] = value;
-}
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
+PyAPI_FUNC(void) PyTuple_SET_ITEM(PyObject*, Py_ssize_t, PyObject*);
 #define PyTuple_SET_ITEM(op, index, value) \
-    PyTuple_SET_ITEM(_PyObject_CAST(op), index, _PyObject_CAST(value))
+    do { PyTruffleTuple_GetItems(op)[index] = value; } while (0)
 #endif
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);

graalpython/com.oracle.graal.python.cext/src/object.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

graalpython/com.oracle.graal.python.cext/src/tupleobject.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2025, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -1424,3 +1424,9 @@ _PyTuple_GET_ITEM(PyObject* a, Py_ssize_t 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) {
+    PyTruffleTuple_GetItems(op)[index] = value;
+}

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tuple.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -151,14 +151,15 @@ class TestPyTuple(CPyExtTestCase):
             ((1, 2, 3), -1, []),
             ((1, 2, 3), 3, str),
         ),
-        code="""PyObject* wrap_PyTuple_SetItem(PyObject* original, Py_ssize_t index, PyObject* value) {
+        code="""
+        PyObject* wrap_PyTuple_SetItem(PyObject* original, Py_ssize_t index, PyObject* value) {
             Py_ssize_t size = PyTuple_Size(original);
             if (size < 0)
                 return NULL;
             PyObject* tuple = PyTuple_New(size);
             if (!tuple)
                 return NULL;
-            for (int i = 0; i < size; i++) {
+            for (int i = 0; i < size / 2; i++) {
                 PyObject* item = PyTuple_GetItem(original, i);
                 if (!item) {
                     Py_DECREF(tuple);
@@ -167,6 +168,22 @@ class TestPyTuple(CPyExtTestCase):
                 Py_INCREF(item);
                 PyTuple_SET_ITEM(tuple, i, item);
             }
+
+            #ifdef GRAALVM_PYTHON
+            // test that we also have it as API function on GraalPy
+            #undef PyTuple_SET_ITEM
+            #endif
+
+            for (int i = size / 2; i < size; i++) {
+                PyObject* item = PyTuple_GetItem(original, i);
+                if (!item) {
+                    Py_DECREF(tuple);
+                    return NULL;
+                }
+                Py_INCREF(item);
+                PyTuple_SET_ITEM(tuple, i, item);
+            }
+
             Py_INCREF(value);
             if (PyTuple_SetItem(tuple, index, value) < 0) {
                 Py_DECREF(tuple);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

scripts/wheelbuilder/build_wheels.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -100,13 +100,10 @@ def create_venv():
     subprocess.check_call([binary, "-m", "venv", "graalpy"])
     print("Installing wheel with", pip, flush=True)
     subprocess.check_call([pip, "install", "wheel"])
-<<<<<<< HEAD
-=======
     print("Installing paatch to provide patch.exe", flush=True)
     p = subprocess.run([pip, "install", "paatch"])
     if p.returncode != 0:
         print("Installing paatch failed, assuming a GNU patch compatible binary is on PATH", flush=True)
->>>>>>> 8ac74ecd42 (Use paatch to apply patches the same way across all platforms)
     return pip