remove duplicate functionality of PyOSFSPathNode

Author: timfel

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

@@ -80,6 +80,7 @@
 import com.oracle.graal.python.lib.PyLongAsLongAndOverflowNode;
 import com.oracle.graal.python.lib.PyLongAsLongNode;
 import com.oracle.graal.python.lib.PyNumberIndexNode;
+import com.oracle.graal.python.lib.PyOSFSPathNode;
 import com.oracle.graal.python.lib.PyObjectAsFileDescriptor;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -2130,27 +2131,10 @@ PNone kill(VirtualFrame frame, long pid, int signal,
     @GenerateNodeFactory
     // Can be used as an equivalent of PyOS_FSPath()
     public abstract static class FspathNode extends PythonUnaryBuiltinNode {
-
-        @Specialization(guards = "isPath(value)")
-        static Object doTrivial(Object value) {
-            return value;
-        }
-
-        @Specialization(guards = "!isPath(value)")
-        Object callFspath(VirtualFrame frame, Object value,
-                        @Cached("create(T___FSPATH__)") LookupAndCallUnaryNode callFSPath) {
-            Object pathObject = callFSPath.executeObject(frame, value);
-            if (isPath(pathObject)) {
-                return pathObject;
-            } else if (pathObject == PNone.NO_VALUE) {
-                throw raise(TypeError, ErrorMessages.EXPECTED_STR_BYTE_OSPATHLIKE_OBJ, value);
-            } else {
-                throw raise(TypeError, ErrorMessages.EXPECTED_FSPATH_TO_RETURN_STR_OR_BYTES, value, pathObject);
-            }
-        }
-
-        protected static boolean isPath(Object obj) {
-            return PGuards.isString(obj) || obj instanceof PBytes;
+        @Specialization
+        static Object doTrivial(VirtualFrame frame, Object value,
+                        @Cached PyOSFSPathNode fsPathNode) {
+            return fsPathNode.execute(frame, value);
         }
     }
 
@@ -2243,14 +2227,14 @@ abstract static class ObjectToOpaquePathNode extends PNodeWithRaise {
 
         @Specialization(guards = "!checkEmpty")
         static Object noCheck(VirtualFrame frame, Object obj, @SuppressWarnings("unused") boolean checkEmpty,
-                        @Cached FspathNode fspathNode,
+                        @Cached PyOSFSPathNode fspathNode,
                         @Cached StringOrBytesToOpaquePathNode stringOrBytesToOpaquePathNode) {
             return stringOrBytesToOpaquePathNode.execute(fspathNode.execute(frame, obj));
         }
 
         @Specialization(guards = "checkEmpty")
         Object withCheck(VirtualFrame frame, Object obj, @SuppressWarnings("unused") boolean checkEmpty,
-                        @Cached FspathNode fspathNode,
+                        @Cached PyOSFSPathNode fspathNode,
                         @Cached PyObjectSizeNode sizeNode,
                         @Cached StringOrBytesToOpaquePathNode stringOrBytesToOpaquePathNode) {
             Object stringOrBytes = fspathNode.execute(frame, obj);
@@ -2415,7 +2399,7 @@ public static PBytes opaquePathToBytes(Object opaquePath, PosixSupportLibrary po
     public abstract static class FsConverterNode extends ArgumentCastNodeWithRaise {
         @Specialization
         static PBytes convert(VirtualFrame frame, Object value,
-                        @Cached FspathNode fspathNode,
+                        @Cached PyOSFSPathNode fspathNode,
                         @Cached StringOrBytesToBytesNode stringOrBytesToBytesNode) {
             return stringOrBytesToBytesNode.execute(fspathNode.execute(frame, value));
         }

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

@@ -60,7 +60,6 @@
 import com.oracle.graal.python.annotations.ClinicConverterFactory.ArgumentIndex;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins;
-import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.buffer.BufferFlags;
@@ -79,6 +78,7 @@
 import com.oracle.graal.python.lib.PyIndexCheckNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyNumberIndexNode;
+import com.oracle.graal.python.lib.PyOSFSPathNode;
 import com.oracle.graal.python.lib.PyObjectGetIter;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -848,7 +848,7 @@ TruffleString doit(VirtualFrame frame, Object value,
                         @CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferAcquireLib,
                         @CachedLibrary(limit = "3") PythonBufferAccessLibrary bufferLib,
                         @Cached CastToTruffleStringNode toString,
-                        @Cached PosixModuleBuiltins.FspathNode fsPath,
+                        @Cached PyOSFSPathNode fsPath,
                         @Cached TruffleString.FromByteArrayNode fromByteArrayNode,
                         @Cached TruffleString.SwitchEncodingNode switchEncodingNode) {
             Object path = fsPath.execute(frame, value);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyOSFSPathNode.java

@@ -96,7 +96,8 @@ static Object callFspath(VirtualFrame frame, Object object,
             throw raiseNode.raise(TypeError, ErrorMessages.EXPECTED_STR_BYTE_OSPATHLIKE_OBJ, object);
         }
         Object result = callFSPath.executeObject(frame, fspathMethod, object);
-        if (isJavaString(result) || result instanceof TruffleString || result instanceof PString || result instanceof PBytes) {
+        assert !isJavaString(result);
+        if (result instanceof TruffleString || result instanceof PString || result instanceof PBytes) {
             return result;
         }
         throw raiseNode.raise(TypeError, ErrorMessages.EXPECTED_FSPATH_TO_RETURN_STR_OR_BYTES, object, result);