[GR-12448] Fix PyBytes_FromStringAndSize.

PullRequest: graalpython/268

Author: fangerer

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

@@ -49,17 +49,19 @@
 PyTypeObject PyBytes_Type = PY_TRUFFLE_TYPE("bytes", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BYTES_SUBCLASS, PyBytesObject_SIZE);
 
 UPCALL_ID(PyBytes_FromStringAndSize);
+UPCALL_ID(PyTruffle_Bytes_EmptyWithCapacity);
 PyObject* PyBytes_FromStringAndSize(const char* str, Py_ssize_t sz) {
-    setlocale(LC_ALL, NULL);
-    const char* encoding = nl_langinfo(CODESET);
-    void *jstr = str != NULL ? polyglot_from_string_n(str, sz, SRC_CS) : to_java(NULL);
-    return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, jstr, sz, polyglot_from_string(encoding, SRC_CS));
+	if (str != NULL) {
+		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, sz));
+	}
+	return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, sz);
 }
 
 PyObject * PyBytes_FromString(const char *str) {
-    setlocale(LC_ALL, NULL);
-    const char* encoding = nl_langinfo(CODESET);
-    return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_string(str, SRC_CS), 0, polyglot_from_string(encoding, SRC_CS));
+	if (str != NULL) {
+		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, strlen(str)));
+	}
+	return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, 0);
 }
 
 UPCALL_ID(PyTruffle_Bytes_AsString);

graalpython/com.oracle.graal.python.test/src/tests/test_memoryview.py

@@ -46,3 +46,7 @@ def test_tobytes():
     b = b"hello"
     v = memoryview(b)
     assert v.tobytes() == b
+
+    b = b"\xff\x00\x00"
+    v = memoryview(b)
+    assert v.tobytes() == b

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -1646,47 +1646,42 @@ Object call(PBuiltinFunction function) {
         }
     }
 
-    @Builtin(name = "PyTruffle_Bytes_EmptyWithCapacity", fixedNumOfPositionalArgs = 2)
+    @Builtin(name = "PyTruffle_Bytes_EmptyWithCapacity", fixedNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    abstract static class PyTruffle_Bytes_EmptyWithCapacity extends NativeBuiltin {
+    abstract static class PyTruffle_Bytes_EmptyWithCapacity extends PythonUnaryBuiltinNode {
 
         @Specialization
-        PBytes doInt(int size, @SuppressWarnings("unused") Object errorMarker) {
+        PBytes doInt(int size) {
             return factory().createBytes(new byte[size]);
         }
 
         @Specialization(rewriteOn = ArithmeticException.class)
-        PBytes doLong(long size, Object errorMarker) {
-            return doInt(PInt.intValueExact(size), errorMarker);
+        PBytes doLong(long size) {
+            return doInt(PInt.intValueExact(size));
         }
 
         @Specialization(replaces = "doLong")
-        PBytes doLongOvf(long size, Object errorMarker) {
+        PBytes doLongOvf(long size) {
             try {
-                return doInt(PInt.intValueExact(size), errorMarker);
+                return doInt(PInt.intValueExact(size));
             } catch (ArithmeticException e) {
                 throw raiseIndexError();
             }
         }
 
         @Specialization(rewriteOn = ArithmeticException.class)
-        PBytes doPInt(PInt size, Object errorMarker) {
-            return doInt(size.intValueExact(), errorMarker);
+        PBytes doPInt(PInt size) {
+            return doInt(size.intValueExact());
         }
 
         @Specialization(replaces = "doPInt")
-        PBytes doPIntOvf(PInt size, Object errorMarker) {
+        PBytes doPIntOvf(PInt size) {
             try {
-                return doInt(size.intValueExact(), errorMarker);
+                return doInt(size.intValueExact());
             } catch (ArithmeticException e) {
                 throw raiseIndexError();
             }
         }
-
-        @Fallback
-        Object doGeneric(Object size, Object errorMarker) {
-            return raiseNative(errorMarker, TypeError, "expected 'int', but was '%p'", size);
-        }
     }
 
     @Builtin(name = "PyTruffle_Upcall", minNumOfPositionalArgs = 3, takesVarArgs = true, declaresExplicitSelf = true)
@@ -2095,4 +2090,17 @@ protected static boolean isPSequence(Object object) {
             return object instanceof PList || object instanceof PTuple;
         }
     }
+
+    @Builtin(name = "PyBytes_FromStringAndSize", fixedNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class PyBytes_FromStringAndSize extends NativeBuiltin {
+
+        @Specialization
+        PBytes doGeneric(PythonNativeObject object) {
+            if (object.object instanceof TruffleObject) {
+                return factory().createBytes(getByteArray((TruffleObject) object.object));
+            }
+            throw raise(TypeError, "invalid pointer: %s", object.object);
+        }
+    }
 }

graalpython/lib-graalpython/python_cext.py

@@ -215,13 +215,6 @@ def PyTruffle_Object_LEN(obj):
 
 ##################### BYTES
 
-def PyBytes_FromStringAndSize(string, size, encoding):
-    if string is not None and string is not Py_NoValue():
-        return bytes(string, encoding)
-    assert size >= 0;
-    return PyTruffle_Bytes_EmptyWithCapacity(size, native_null)
-
-
 def PyBytes_AsStringCheckEmbeddedNull(obj, encoding):
     if not PyBytes_Check(obj):
         raise TypeError('expected bytes, {!s} found'.format(type(obj)))