[GR-64327] Backport to 24.2: Add support for ormsgpack and prepare upstreaming some changes

PullRequest: graalpython/3765

Author: OracleLabsAutomation

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,9 @@ 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
+// 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*);
 #define PyTuple_SET_ITEM(op, index, value) \
-    PyTuple_SET_ITEM(_PyObject_CAST(op), index, _PyObject_CAST(value))
-#endif
+    PyTuple_SET_ITEM(_PyObject_CAST(op), (index), _PyObject_CAST(value))
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);

graalpython/com.oracle.graal.python.cext/include/object.h

@@ -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-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -124,7 +124,9 @@ typedef struct {
 
 // Test if the 'x' object is the 'y' object, the same as "x is y" in Python.
 PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y);
+#if 0 // GraalPy change
 #define Py_Is(x, y) ((x) == (y))
+#endif // GraalPy change
 
 
 PyAPI_FUNC(Py_ssize_t) PyTruffle_REFCNT(PyObject *ob);

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
@@ -2507,7 +2507,12 @@ Py_XNewRef(PyObject *obj)
 // for the stable ABI.
 int Py_Is(PyObject *x, PyObject *y)
 {
+#if 0 // GraalPy change
     return (x == y);
+#else
+    return (x == y) ||
+        (points_to_py_handle_space(x) && points_to_py_handle_space(y) && GraalPyTruffle_Is(x, y));
+#endif
 }
 
 int Py_IsNone(PyObject *x)

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
@@ -129,6 +129,7 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
@@ -739,4 +740,13 @@ static Object getDict(Object object,
             return getDict.execute(inliningTarget, object);
         }
     }
+
+    @CApiBuiltin(ret = Int, args = {PyObject, PyObject}, call = Ignored)
+    abstract static class PyTruffle_Is extends CApiBinaryBuiltinNode {
+        @Specialization
+        static int isTrue(Object a, Object b,
+                        @Cached IsNode isNode) {
+            return isNode.execute(a, b) ? 1 : 0;
+        }
+    }
 }

graalpython/lib-graalpython/patches/metadata.toml

@@ -337,6 +337,11 @@ version = '== 3.10.5'
 patch = 'orjson-3.10.5.patch'
 license = 'Apache-2.0 OR MIT'
 
+[[ormsgpack.rules]]
+version = '>= 1.8.0, <= 1.9.1'
+patch = 'ormsgpack-1.8.0-1.9.1.patch'
+license = 'Apache-2.0 OR MIT'
+
 [[overrides.rules]]
 version = '== 7.4.0'
 # Important: This patch esentially breaks the package, it's not upstreamable. The package relies on bytecode parsing