add test and fix for PyByteArray_AsString/_Size

Author: timfel

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.jni/src/capi_native.c

@@ -634,6 +634,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/tests/cpyext/test_bytes.py

@@ -61,6 +61,9 @@ def _as_string(args):
         return TypeError()
     return args[0].decode()
 
+def _as_string_ba(args):
+    return args[0].decode()
+
 def _as_string_and_size(args):
     if not isinstance(args[0], bytes):
         return TypeError()
@@ -90,6 +93,17 @@ def __iter__(self):
     tp_free='0',
 )
 
+ByteArraySubclass = CPyExtType(
+    "ByteArraySubclass",
+    '',
+    struct_base='PyByteArrayObject bytes',
+    tp_itemsize='sizeof(char)',
+    tp_base='&PyByteArray_Type',
+    tp_new='0',
+    tp_alloc='0',
+    tp_free='0',
+)
+
 
 class TestPyBytes(CPyExtTestCase):
 
@@ -147,6 +161,20 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+    # PyByteArray_AsString
+    test_PyByteArray_AsString = CPyExtFunction(
+        _as_string_ba,
+        lambda: (
+            (bytearray(b"hello"),),
+            (bytearray(b"world"),),
+            (ByteArraySubclass(b"hello"),),
+        ),
+        resultspec="s",
+        argspec="O",
+        arguments=["PyObject* arg"],
+        cmpfunc=unhandled_error_compare
+    )
+
     # PyBytes_AsStringAndSize
     test_PyBytes_AsStringAndSize = CPyExtFunction(
         _as_string_and_size,
@@ -211,6 +239,20 @@ def compile_module(self, name):
         arguments=["PyObject* arg"],
     )
 
+    # PyByteArray_Size
+    test_PyByteArray_Size = CPyExtFunction(
+        lambda b: len(b[0]),
+        lambda: (
+            (bytearray(b"hello"),),
+            (bytearray(b"hello world"),),
+            (bytearray(b""),),
+            (ByteArraySubclass(b"hello"),),
+        ),
+        resultspec="n",
+        argspec="O",
+        arguments=["PyObject* arg"],
+    )
+
     # PyBytes_GET_SIZE
     test_PyBytes_GET_SIZE = CPyExtFunction(
         lambda b: len(b[0]),