Add support for PyUnicode_FSDecoder

Author: qunaibit

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

@@ -3719,7 +3719,6 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
 }
 
 
-#if 0 // GraalPy change
 int
 PyUnicode_FSDecoder(PyObject* arg, void* addr)
 {
@@ -3729,6 +3728,7 @@ PyUnicode_FSDecoder(PyObject* arg, void* addr)
         return 1;
     }
 
+#if 0 // GraalPy change: 'findchar' not supported
     PyObject *path = PyOS_FSPath(arg);
     if (path == NULL) {
         return 0;
@@ -3760,11 +3760,19 @@ PyUnicode_FSDecoder(PyObject* arg, void* addr)
         Py_DECREF(output);
         return 0;
     }
+#else // GraalPy change: different implementation
+    PyObject *output = NULL;
+    output = GraalPyTruffleUnicode_FSDecoder(arg);
+    if (!output) {
+        return 0;
+    }
+#endif // GraalPy change
     *(PyObject**)addr = output;
     return Py_CLEANUP_SUPPORTED;
 }
 
 
+#if 0 // GraalPy change
 static int unicode_fill_utf8(PyObject *unicode);
 #endif // GraalPy change
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextUnicodeBuiltins.java

@@ -144,6 +144,7 @@
 import com.oracle.graal.python.lib.PySliceNew;
 import com.oracle.graal.python.lib.PyTupleGetItem;
 import com.oracle.graal.python.lib.PyUnicodeCheckExactNode;
+import com.oracle.graal.python.lib.PyUnicodeFSDecoderNode;
 import com.oracle.graal.python.lib.PyUnicodeFromEncodedObject;
 import com.oracle.graal.python.lib.RichCmpOp;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -880,6 +881,16 @@ static Object doManaged(Object ptr, long byteLength, int kind,
         }
     }
 
+    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Ignored)
+    abstract static class PyTruffleUnicode_FSDecoder extends CApiUnaryBuiltinNode {
+
+        @Specialization
+        static Object fsDecoder(Object arg,
+                        @Cached PyUnicodeFSDecoderNode fsDecoderNode) {
+            return fsDecoderNode.execute(null, arg);
+        }
+    }
+
     @CApiBuiltin(ret = PyObjectTransfer, args = {Pointer, Py_ssize_t, Int}, call = Ignored)
     abstract static class PyTruffleUnicode_FromUTF extends CApiTernaryBuiltinNode {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -974,7 +974,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyUnicode_DecodeUTF7", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_DecodeUTF7Stateful", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString, PY_SSIZE_T_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicode_DecodeUnicodeEscape", ret = PyObject, args = {ConstCharPtrAsTruffleString, Py_ssize_t, ConstCharPtrAsTruffleString}, call = NotImplemented)
-    @CApiBuiltin(name = "PyUnicode_FSDecoder", ret = Int, args = {PyObject, Pointer}, call = NotImplemented)
+    @CApiBuiltin(name = "PyUnicode_FSDecoder", ret = Int, args = {PyObject, Pointer}, call = CImpl)
     @CApiBuiltin(name = "PyUnicode_Fill", ret = Py_ssize_t, args = {PyObject, Py_ssize_t, Py_ssize_t, PY_UCS4}, call = CImpl)
     @CApiBuiltin(name = "PyUnicode_GetDefaultEncoding", ret = ConstCharPtrAsTruffleString, args = {}, call = CImpl)
     @CApiBuiltin(name = "PyUnicode_IsIdentifier", ret = Int, args = {PyObject}, call = NotImplemented)