Implement HPy context function ctx_Unicode_DecodeFSDefault

Author: fangerer

graalpython/com.oracle.graal.python.cext/hpy/hpy.c

@@ -1164,6 +1164,11 @@ HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Unicode_FromWideChar)(HPyContext *ctx, const w
 	return UPCALL_HPY(ctx_Unicode_FromWideChar, ctx, w, size);
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Unicode_DecodeFSDefault)(HPyContext *ctx, const char *v)
+{
+	return UPCALL_HPY(ctx_Unicode_DecodeFSDefault, ctx, v);
+}
+
 HPyAPI_STORAGE int _HPy_IMPL_NAME(List_Check)(HPyContext *ctx, HPy h)
 {
 	return (int) UPCALL_I32(ctx_List_Check, ctx, h);
@@ -1467,6 +1472,7 @@ HPyContext *graal_hpy_context_to_native(HPyContext *managed_context) {
     HPY_CTX_UPCALL(ctx_Unicode_AsUTF8String);
     HPY_CTX_UPCALL(ctx_Unicode_AsUTF8AndSize);
     HPY_CTX_UPCALL(ctx_Unicode_FromWideChar);
+    HPY_CTX_UPCALL(ctx_Unicode_DecodeFSDefault);
     HPY_CTX_UPCALL(ctx_List_Check);
     HPY_CTX_UPCALL(ctx_List_New);
     HPY_CTX_UPCALL(ctx_List_Append);

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

@@ -533,7 +533,7 @@ private PException raiseCallStackDepth() {
     public abstract static class GetFileSystemEncodingNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
-        protected static String getFileSystemEncoding() {
+        public static String getFileSystemEncoding() {
             String javaEncoding = System.getProperty("file.encoding");
             String pythonEncoding = CharsetMapping.getPythonEncodingNameFromJavaName(javaEncoding);
             // Fallback on returning the property value if no mapping found

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -196,6 +196,7 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnaryArithmetic;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeAsUTF8AndSize;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeAsUTF8String;
+import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeDecodeFSDefault;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeFromString;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyUnicodeFromWchar;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.ReturnType;
@@ -562,6 +563,7 @@ enum HPyContextMember {
         CTX_UNICODE_ASUTF8STRING("ctx_Unicode_AsUTF8String"),
         CTX_UNICODE_ASUTF8ANDSIZE("ctx_Unicode_AsUTF8AndSize"),
         CTX_UNICODE_FROMWIDECHAR("ctx_Unicode_FromWideChar"),
+        CTX_UNICODE_DECODEFSDEFAULT("ctx_Unicode_DecodeFSDefault"),
         CTX_LIST_NEW("ctx_List_New"),
         CTX_LIST_APPEND("ctx_List_Append"),
         CTX_DICT_CHECK("ctx_Dict_Check"),
@@ -1269,6 +1271,7 @@ private static Object[] createMembers(PythonContext context, String name) {
         members[HPyContextMember.CTX_UNICODE_ASUTF8ANDSIZE.ordinal()] = new GraalHPyUnicodeAsUTF8AndSize();
         members[HPyContextMember.CTX_UNICODE_FROMSTRING.ordinal()] = new GraalHPyUnicodeFromString();
         members[HPyContextMember.CTX_UNICODE_FROMWIDECHAR.ordinal()] = new GraalHPyUnicodeFromWchar();
+        members[HPyContextMember.CTX_UNICODE_DECODEFSDEFAULT.ordinal()] = new GraalHPyUnicodeDecodeFSDefault();
         members[HPyContextMember.CTX_TYPE_FROM_SPEC.ordinal()] = new GraalHPyTypeFromSpec();
         members[HPyContextMember.CTX_GETATTR.ordinal()] = new GraalHPyGetAttr(OBJECT);
         members[HPyContextMember.CTX_GETATTR_S.ordinal()] = new GraalHPyGetAttr(CHAR_PTR);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -67,6 +67,7 @@
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.SysModuleBuiltins.GetFileSystemEncodingNode;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropGetAttributeNode;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropSubscriptAssignNode;
@@ -1145,6 +1146,28 @@ Object execute(Object[] arguments,
         }
     }
 
+    @ExportLibrary(InteropLibrary.class)
+    public static final class GraalHPyUnicodeDecodeFSDefault extends GraalHPyContextFunction {
+
+        @ExportMessage
+        Object execute(Object[] arguments,
+                        @Cached HPyAsContextNode asContextNode,
+                        @Cached PCallHPyFunction callFromStringNode,
+                        @Cached HPyAsHandleNode asHandleNode,
+                        @Exclusive @Cached GilNode gil) throws ArityException {
+            boolean mustRelease = gil.acquire();
+            try {
+                checkArity(arguments, 2);
+                GraalHPyContext context = asContextNode.execute(arguments[0]);
+                String fileSystemEncoding = GetFileSystemEncodingNode.getFileSystemEncoding();
+                Object result = callFromStringNode.call(context, GraalHPyNativeSymbol.POLYGLOT_FROM_STRING, arguments[1], fileSystemEncoding);
+                return asHandleNode.execute(context, result);
+            } finally {
+                gil.release(mustRelease);
+            }
+        }
+    }
+
     @ExportLibrary(InteropLibrary.class)
     public static final class GraalHPyAsPyObject extends GraalHPyContextFunction {