Fix upcall to PyUnicode_Decode

Author: msimacek

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

@@ -568,12 +568,13 @@ PyObject * PyUnicode_AsUnicodeEscapeString(PyObject *unicode) {
 	return UPCALL_CEXT_O(_jls_PyUnicode_AsUnicodeEscapeString, native_to_java(unicode));
 }
 
-UPCALL_ID(PyUnicode_Decode);
+typedef PyObject* (*unicode_PyUnicode_Decode_fun_t)(void *data, const char *encoding, const char *errors);
+UPCALL_TYPED_ID(PyUnicode_Decode, unicode_PyUnicode_Decode_fun_t);
 PyObject * PyUnicode_Decode(const char *s, Py_ssize_t size, const char *encoding, const char *errors) {
     if (encoding == NULL) {
         return PyUnicode_DecodeUTF8Stateful(s, size, errors, NULL);
     }
-	return UPCALL_CEXT_O(_jls_PyUnicode_Decode, s, size, polyglot_from_string(encoding, SRC_CS), convert_errors(errors));
+	return _jls_PyUnicode_Decode(polyglot_from_i8_array(s, size), polyglot_from_string(encoding, SRC_CS), convert_errors(errors));
 }
 
 PyObject * PyUnicode_DecodeASCII(const char *s, Py_ssize_t size, const char *errors) {

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

@@ -2574,18 +2574,18 @@ protected static boolean isReprFormatCode(int formatCode) {
         }
     }
 
-    @Builtin(name = "PyUnicode_Decode", minNumOfPositionalArgs = 5, declaresExplicitSelf = true)
+    @Builtin(name = "PyUnicode_Decode", minNumOfPositionalArgs = 4, declaresExplicitSelf = true)
     @GenerateNodeFactory
     abstract static class PyUnicode_Decode extends NativeUnicodeBuiltin {
 
         @Specialization
-        Object doDecode(VirtualFrame frame, Object module, Object cByteArray, long size, String encoding, String errors,
+        Object doDecode(VirtualFrame frame, Object module, Object cByteArray, String encoding, String errors,
                         @Cached CExtNodes.ToSulongNode toSulongNode,
                         @Cached GetByteArrayNode getByteArrayNode,
                         @Cached GetNativeNullNode getNativeNullNode) {
 
             try {
-                ByteBuffer inputBuffer = wrap(getByteArrayNode.execute(cByteArray, size));
+                ByteBuffer inputBuffer = wrap(getByteArrayNode.execute(cByteArray, -1));
                 int n = remaining(inputBuffer);
                 CharBuffer resultBuffer = allocateCharBuffer(n * 4);
                 decode(resultBuffer, inputBuffer, encoding, errors);