Move POL.asPath to a node

Author: msimacek

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

@@ -119,7 +119,6 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.ObjectNodes;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
@@ -140,6 +139,7 @@
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.lib.PyObjectStrAsJavaStringNode;
 import com.oracle.graal.python.lib.PyObjectStrAsObjectNode;
+import com.oracle.graal.python.lib.PyUnicodeFSDecoderNode;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.GraalPythonTranslationErrorNode;
@@ -839,7 +839,7 @@ PCode generic(VirtualFrame frame, Object wSource, Object wFilename, Object wMode
                         @Cached CodecsModuleBuiltins.HandleDecodingErrorNode handleDecodingErrorNode,
                         @Cached PyObjectStrAsJavaStringNode asStrNode,
                         @CachedLibrary("wSource") InteropLibrary interopLib,
-                        @CachedLibrary(limit = "4") PythonObjectLibrary lib,
+                        @Cached PyUnicodeFSDecoderNode asPath,
                         @Cached WarnNode warnNode) {
             if (wSource instanceof PCode) {
                 return (PCode) wSource;
@@ -857,7 +857,7 @@ PCode generic(VirtualFrame frame, Object wSource, Object wFilename, Object wMode
                     bufferLib.release(filenameBuffer);
                 }
             } else {
-                filename = lib.asPathWithState(wFilename, PArguments.getThreadState(frame));
+                filename = asPath.execute(frame, wFilename);
             }
             String mode;
             try {

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

@@ -63,10 +63,10 @@
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.ssl.ALPNHelper;
 import com.oracle.graal.python.builtins.objects.ssl.CertUtils;
 import com.oracle.graal.python.builtins.objects.ssl.SSLCipher;
@@ -76,23 +76,23 @@
 import com.oracle.graal.python.builtins.objects.ssl.SSLOptions;
 import com.oracle.graal.python.builtins.objects.ssl.SSLProtocol;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.lib.PyUnicodeFSDecoderNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
-import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.library.CachedLibrary;
 
 @CoreFunctions(defineModule = "_ssl")
 public class SSLModuleBuiltins extends PythonBuiltins {
@@ -358,10 +358,10 @@ Object getDefaultPaths() {
     @Builtin(name = "_test_decode_cert", minNumOfPositionalArgs = 1, numOfPositionalOnlyArgs = 1, parameterNames = {"path"})
     @GenerateNodeFactory
     abstract static class DecodeCertNode extends PythonUnaryBuiltinNode {
-        @Specialization(limit = "2")
+        @Specialization
         Object decode(VirtualFrame frame, Object path,
-                        @CachedLibrary("path") PythonObjectLibrary lib) {
-            return decode(toTruffleFile(frame, lib, path));
+                        @Cached PyUnicodeFSDecoderNode asPath) {
+            return decode(toTruffleFile(frame, asPath, path));
         }
 
         @TruffleBoundary
@@ -387,10 +387,10 @@ private Object decode(TruffleFile file) throws PException {
             }
         }
 
-        private TruffleFile toTruffleFile(VirtualFrame frame, PythonObjectLibrary lib, Object fileObject) throws PException {
+        private TruffleFile toTruffleFile(VirtualFrame frame, PyUnicodeFSDecoderNode asPath, Object fileObject) throws PException {
             TruffleFile file;
             try {
-                file = getContext().getEnv().getPublicTruffleFile(lib.asPath(fileObject));
+                file = getContext().getEnv().getPublicTruffleFile(asPath.execute(frame, fileObject));
                 if (!file.exists()) {
                     throw raiseOSError(frame, OSErrorEnum.ENOENT);
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -45,7 +45,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.KEYS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELETE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELITEM__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__FSPATH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETITEM__;
@@ -646,24 +645,6 @@ private static void addKeysFromObject(HashSet<String> keys, PythonObject o, bool
         }
     }
 
-    @ExportMessage
-    public String asPathWithState(ThreadState state,
-                    @CachedLibrary("this") PythonObjectLibrary lib,
-                    @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib,
-                    @Shared("raise") @Cached PRaiseNode raise,
-                    @Cached CastToJavaStringNode castToJavaStringNode) {
-        Object func = lib.lookupAttributeOnType(this, __FSPATH__);
-        if (func == PNone.NO_VALUE) {
-            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.EXPECTED_STR_BYTE_OSPATHLIKE_OBJ, this);
-        }
-        Object pathObject = methodLib.callUnboundMethodWithState(func, state, this);
-        try {
-            return castToJavaStringNode.execute(pathObject);
-        } catch (CannotCastException e) {
-            throw raise.raise(PythonBuiltinClassType.TypeError, ErrorMessages.EXPECTED_FSPATH_TO_RETURN_STR_OR_BYTES, this, pathObject);
-        }
-    }
-
     @ExportMessage
     public Object lookupAttributeInternal(ThreadState state, String name, boolean strict,
                     @Shared("gotState") @Cached ConditionProfile gotState,
@@ -1769,7 +1750,7 @@ public static Object getIteratorWithState(PythonAbstractObject self, ThreadState
                         @Cached("createIterMethodProfile(plib)") ValueProfile iterMethodProfile,
                         @Cached IteratorNodes.IsIteratorObjectNode isIteratorObjectNode,
                         @Cached PythonObjectFactory factory,
-                        @Shared("raise") @Cached PRaiseNode raise) {
+                        @Cached PRaiseNode raise) {
             Object v = plib.getDelegatedValue(self);
             Object iterMethod = iterMethodProfile.profile(plib.lookupAttributeOnType(self, __ITER__));
             if (iterMethod != PNone.NONE) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PBytes.java

@@ -31,9 +31,6 @@
 
 import com.oracle.graal.python.builtins.objects.buffer.BufferFlags;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAcquireLibrary;
-import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
-import com.oracle.graal.python.builtins.objects.function.PArguments.ThreadState;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.runtime.sequence.PSequence;
@@ -47,7 +44,6 @@
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.api.object.Shape;
 
-@ExportLibrary(PythonObjectLibrary.class)
 @ExportLibrary(InteropLibrary.class)
 @ExportLibrary(PythonBufferAcquireLibrary.class)
 public final class PBytes extends PBytesLike {
@@ -103,12 +99,6 @@ public final int hashCode() {
         return store.hashCode();
     }
 
-    @ExportMessage
-    public String asPathWithState(@SuppressWarnings("unused") ThreadState state,
-                    @Cached SequenceStorageNodes.ToByteArrayNode toBytes) {
-        return BytesUtils.createASCIIString(toBytes.execute(getSequenceStorage()));
-    }
-
     @ExportMessage
     @SuppressWarnings("unused")
     public static boolean isArrayElementModifiable(PBytes self, long index) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

@@ -323,8 +323,8 @@ static Object eq(Object self, Object other) {
         }
 
         private boolean recursive(VirtualFrame frame, PyObjectRichCompareBool.EqNode eqNode, PMemoryView self, PMemoryView other,
-                                  MemoryViewNodes.ReadItemAtNode readSelf, MemoryViewNodes.ReadItemAtNode readOther,
-                                  int dim, int ndim, Object selfPtr, int initialSelfOffset, Object otherPtr, int initialOtherOffset) {
+                        MemoryViewNodes.ReadItemAtNode readSelf, MemoryViewNodes.ReadItemAtNode readOther,
+                        int dim, int ndim, Object selfPtr, int initialSelfOffset, Object otherPtr, int initialOtherOffset) {
             int selfOffset = initialSelfOffset;
             int otherOffset = initialOtherOffset;
             for (int i = 0; i < self.getBufferShape()[dim]; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java

@@ -60,11 +60,6 @@
 
 @ExportLibrary(value = PythonObjectLibrary.class, receiverType = String.class)
 final class DefaultPythonStringExports {
-    @ExportMessage
-    static String asPathWithState(String value, @SuppressWarnings("unused") ThreadState state) {
-        return value;
-    }
-
     @ExportMessage
     static Object lookupAttributeInternal(String receiver, ThreadState state, String name, boolean strict,
                     @Cached ConditionProfile gotState,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java

@@ -281,22 +281,6 @@ private boolean profileHasFrame(VirtualFrame frame) {
         }
     }
 
-    /**
-     * Return the file system path representation of the object. If the object is str or bytes, then
-     * allow it to pass through. If the object defines __fspath__(), then return the result of that
-     * method. All other types raise a TypeError.
-     */
-    public String asPathWithState(Object receiver, @SuppressWarnings("unused") ThreadState threadState) {
-        throw getDefaultNodes().getRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.EXPECTED_STR_BYTE_OSPATHLIKE_OBJ, receiver);
-    }
-
-    /**
-     * @see #asPathWithState
-     */
-    public final String asPath(Object receiver) {
-        return asPathWithState(receiver, null);
-    }
-
     /**
      * Looks up an attribute for the given receiver like {@code PyObject_LookupAttr}.
      *