[GR-44984] Fix and expand test for PyList_SET_ITEM

PullRequest: graalpython/2837

Author: timfel

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2022 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -35,5 +35,6 @@ PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
 #define _PyList_CAST(op) (assert(PyList_Check(op)), (PyListObject *)(op))
 
 #define PyList_GET_ITEM(op, i) (PyList_GetItem((PyObject *)(op), (i)))
-#define PyList_SET_ITEM(op, i, v) (PyList_SetItem((PyObject *)(op), (i), (v)))
+PyAPI_FUNC(void) _PyList_SET_ITEM(PyObject *, Py_ssize_t, PyObject *);
+#define PyList_SET_ITEM(op, i, v) (_PyList_SET_ITEM((PyObject *)(op), (i), (v)))
 #define PyList_GET_SIZE(op)    Py_SIZE(_PyList_CAST(op))

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

@@ -47,14 +47,6 @@ char* _PyByteArray_Start(PyObject* obj) {
 	return PyByteArrayObject_ob_start(obj);
 }
 
-char* PyByteArray_AsString(PyObject* obj) {
-    return PyByteArray_AS_STRING(obj);
-}
-
-Py_ssize_t PyByteArray_Size(PyObject *self) {
-    return PyByteArray_GET_SIZE(self);
-}
-
 // taken from CPython 3.7.0 "Objects/bytearrayobject.c"
 int bytearray_getbuffer(PyByteArrayObject *obj, Py_buffer *view, int flags) {
     void *ptr;

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, 2023, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+char* PyByteArray_AsString(PyObject* obj) {
+    return PyByteArray_AS_STRING(obj);
+}
+
+Py_ssize_t PyByteArray_Size(PyObject *self) {
+    return PyByteArray_GET_SIZE(self);
+}

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

@@ -2361,6 +2361,14 @@ PyAPI_FUNC(int) Py_AtExit(void (*a)(void)) {
 PyAPI_FUNC(PyObject*) Py_CompileString(const char* a, const char* b, int c) {
     return GraalPy_CompileString(truffleString(a), truffleString(b), c);
 }
+#undef Py_CompileStringExFlags
+PyAPI_FUNC(PyObject*) Py_CompileStringExFlags(const char* a, const char* b, int c, PyCompilerFlags* d, int e) {
+    return GraalPy_CompileStringExFlags(truffleString(a), truffleString(b), c, d, e);
+}
+#undef Py_CompileStringObject
+PyAPI_FUNC(PyObject*) Py_CompileStringObject(const char* a, PyObject* b, int c, PyCompilerFlags* d, int e) {
+    return GraalPy_CompileStringObject(truffleString(a), b, c, d, e);
+}
 #undef Py_EnterRecursiveCall
 PyAPI_FUNC(int) Py_EnterRecursiveCall(const char* a) {
     return GraalPy_EnterRecursiveCall(a);
@@ -2397,6 +2405,10 @@ PyAPI_FUNC(void) _PyErr_WriteUnraisableMsg(const char* a, PyObject* b) {
 PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject* a, PyObject* b) {
     return Graal_PyList_Extend(a, b);
 }
+#undef _PyList_SET_ITEM
+PyAPI_FUNC(void) _PyList_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
+    Graal_PyList_SET_ITEM(a, b, c);
+}
 #undef _PyLong_Sign
 PyAPI_FUNC(int) _PyLong_Sign(PyObject* a) {
     return Graal_PyLong_Sign(a);

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -416,6 +416,8 @@ typedef struct {
     BUILTIN(PyWeakref_NewRef, PyObject*, PyObject*, PyObject*) \
     BUILTIN(Py_AtExit, int, void (*)(void)) \
     BUILTIN(Py_CompileString, PyObject*, const char*, const char*, int) \
+    BUILTIN(Py_CompileStringExFlags, PyObject*, const char*, const char*, int, PyCompilerFlags*, int) \
+    BUILTIN(Py_CompileStringObject, PyObject*, const char*, PyObject*, int, PyCompilerFlags*, int) \
     BUILTIN(Py_EnterRecursiveCall, int, const char*) \
     BUILTIN(Py_GenericAlias, PyObject*, PyObject*, PyObject*) \
     BUILTIN(Py_LeaveRecursiveCall, void) \
@@ -607,6 +609,7 @@ typedef struct {
     BUILTIN(_PyErr_BadInternalCall, void, const char*, int) \
     BUILTIN(_PyErr_WriteUnraisableMsg, void, const char*, PyObject*) \
     BUILTIN(_PyList_Extend, PyObject*, PyListObject*, PyObject*) \
+    BUILTIN(_PyList_SET_ITEM, void, PyObject*, Py_ssize_t, PyObject*) \
     BUILTIN(_PyLong_Sign, int, PyObject*) \
     BUILTIN(_PyNamespace_New, PyObject*, PyObject*) \
     BUILTIN(_PyNumber_Index, PyObject*, PyObject*) \

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, 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
@@ -40,4 +40,6 @@
  */
 #include "capi.h"
 
-
+void* PyTruffle_NativeListItems(PyListObject* list) {
+    return polyglot_from_PyObjectPtr_array(list->ob_item, list->ob_base.ob_size);
+}

graalpython/com.oracle.graal.python.jni/src/capi_forwards.h

@@ -1363,6 +1363,7 @@ void unimplemented(const char* name) {
 #undef _PyInterpreterState_SetEvalFrameFunc
 #undef _PyList_DebugMallocStats
 #undef _PyList_Extend
+#undef _PyList_SET_ITEM
 #undef _PyLong_AsByteArray
 #undef _PyLong_AsInt
 #undef _PyLong_AsTime_t
@@ -4561,11 +4562,15 @@ PyAPI_FUNC(PyObject*) Py_CompileString(const char* a, const char* b, int c) {
     PyObject* result = (PyObject*) __target__Py_CompileString(a, b, c);
     return result;
 }
+PyObject* (*__target__Py_CompileStringExFlags)(const char*, const char*, int, PyCompilerFlags*, int) = NULL;
 PyAPI_FUNC(PyObject*) Py_CompileStringExFlags(const char* a, const char* b, int c, PyCompilerFlags* d, int e) {
-    unimplemented("Py_CompileStringExFlags"); exit(-1);
+    PyObject* result = (PyObject*) __target__Py_CompileStringExFlags(a, b, c, d, e);
+    return result;
 }
+PyObject* (*__target__Py_CompileStringObject)(const char*, PyObject*, int, PyCompilerFlags*, int) = NULL;
 PyAPI_FUNC(PyObject*) Py_CompileStringObject(const char* a, PyObject* b, int c, PyCompilerFlags* d, int e) {
-    unimplemented("Py_CompileStringObject"); exit(-1);
+    PyObject* result = (PyObject*) __target__Py_CompileStringObject(a, b, c, d, e);
+    return result;
 }
 PyAPI_FUNC(wchar_t*) Py_DecodeLocale(const char* a, size_t* b) {
     unimplemented("Py_DecodeLocale"); exit(-1);
@@ -5165,6 +5170,9 @@ PyAPI_FUNC(PyObject*) _PyList_Extend(PyListObject* a, PyObject* b) {
     PyObject* result = (PyObject*) Graal_PyList_Extend(a, b);
     return result;
 }
+PyAPI_FUNC(void) _PyList_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
+    Graal_PyList_SET_ITEM(a, b, c);
+}
 PyAPI_FUNC(time_t) _PyLong_AsTime_t(PyObject* a) {
     unimplemented("_PyLong_AsTime_t"); exit(-1);
 }
@@ -6438,6 +6446,8 @@ void initializeCAPIForwards(void* (*getAPI)(const char*)) {
     __target__PyUnicode_New = getAPI("PyUnicode_New");
     __target__PyVectorcall_Call = getAPI("PyVectorcall_Call");
     __target__Py_CompileString = getAPI("Py_CompileString");
+    __target__Py_CompileStringExFlags = getAPI("Py_CompileStringExFlags");
+    __target__Py_CompileStringObject = getAPI("Py_CompileStringObject");
     __target__Py_GetBuildInfo = getAPI("Py_GetBuildInfo");
     __target__Py_GetCompiler = getAPI("Py_GetCompiler");
     __target__Py_GetVersion = getAPI("Py_GetVersion");

graalpython/com.oracle.graal.python.jni/src/capi_native.c

@@ -665,6 +665,7 @@ static int polyglot_is_value(const void *value) {
 
 #include "_warnings.c"
 #include "boolobject.c"
+#include "bytearrayobject_shared.c"
 #include "longobject_shared.c"
 #include "complexobject.c"
 #include "dictobject.c"

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

@@ -257,6 +257,11 @@ public void builtinFunctionsAreImporteable() throws UnsupportedEncodingException
             assertEquals("Hello World\n", out.toString("UTF-8"));
         }
 
+        @Test
+        public void enumeratingMainBindingsWorks() throws Exception {
+            assertTrue(context.getBindings("python").getMemberKeys().contains("__builtins__"));
+        }
+
         @Test
         public void testMultipleInvocationsAreInSameScope() throws UnsupportedEncodingException {
             String source = "def foo(a, b):\n" +

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

@@ -1219,7 +1219,102 @@ def compile_module(self, name):
         arguments=["PyObject* haystack", "PyObject* needle"],
         cmpfunc=unhandled_error_compare
     )
-    
+
+    def index_func(args):
+        for idx,obj in enumerate(args[0]):
+            if obj == args[1]:
+                return idx
+        raise ValueError
+
+    test_PySequence_Index = CPyExtFunction(
+        index_func,
+        lambda: (
+            (tuple(), 1),
+            ((1, 2, 3), 1),
+            ((1, 2, 3), 4),
+            ((None,), 1),
+            ([], 1),
+            (['a', 'b', 'c'], 'a'),
+            (['a', 'b', 'c'], 'd'),
+            ([None], 1),
+            (set(), 1),
+            ({'a', 'b'}, 'a'),
+            ({'a', 'b'}, 'c'),
+            (DummyListSubclass(), 1),
+            ('hello', 'e'),
+            ('hello', 'x'),
+        ),
+        resultspec="i",
+        argspec='OO',
+        arguments=["PyObject* haystack", "PyObject* needle"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    def count_func(args):
+        c = 0
+        for obj in args[0]:
+            if obj == args[1]:
+                c += 1
+        return c
+
+    test_PySequence_Count = CPyExtFunction(
+        count_func,
+        lambda: (
+            (tuple(), 1),
+            ((1, 2, 3), 1),
+            ((1, 2, 3), 4),
+            ((None,), 1),
+            ([], 1),
+            (['a', 'b', 'c'], 'a'),
+            (['a', 'b', 'c'], 'd'),
+            ([None], 1),
+            (set(), 1),
+            ({'a', 'b'}, 'a'),
+            ({'a', 'b'}, 'c'),
+            (DummyListSubclass(), 1),
+            ('hello', 'e'),
+            ('hello', 'x'),
+        ),
+        resultspec="i",
+        argspec='OO',
+        arguments=["PyObject* haystack", "PyObject* needle"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    def _reference_setslice(args):
+        args[0][args[1]:args[2]] = args[3]
+        return 0;
+
+    test_PySequence_SetSlice = CPyExtFunction(
+        _reference_setslice,
+        lambda: (
+            ([1,2,3,4],0,4,[5,6,7,8]),
+            ([],1,2, [5,6]),
+            ([1,2,3,4],10,20,[5,6,7,8]),
+        ),
+        resultspec="i",
+        argspec='OnnO',
+        arguments=["PyObject* op", "Py_ssize_t ilow", "Py_ssize_t ihigh", "PyObject* v"],
+        cmpfunc=unhandled_error_compare
+    )
+
+    def _reference_delslice(args):
+        del args[0][args[1]:args[2]]
+        return 0;
+
+    test_PySequence_DelSlice = CPyExtFunction(
+        _reference_delslice,
+        lambda: (
+            ([1,2,3,4],0,4),
+            ([],1,2),
+            ([1,2,3,4],10,20),
+        ),
+        resultspec="i",
+        argspec='Onn',
+        arguments=["PyObject* op", "Py_ssize_t ilow", "Py_ssize_t ihigh"],
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PySequence_ITEM = CPyExtFunction(
         _reference_getitem,
         lambda: (