Use CastToPathNode instead of PString::getValue

Author: msimacek

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

@@ -110,7 +110,6 @@
 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.socket.PSocket;
-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.LazyPythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -304,11 +303,6 @@ Object execute(VirtualFrame frame, PythonModule thisModule, String path, PList a
             return doExecute(frame, thisModule, path, args);
         }
 
-        @Specialization
-        Object execute(VirtualFrame frame, PythonModule thisModule, PString path, PTuple args) {
-            return execute(frame, thisModule, path.getValue(), args);
-        }
-
         @Specialization
         Object execute(VirtualFrame frame, PythonModule thisModule, String path, PTuple args) {
             // in case of execl the PList happens to be in the tuples first entry
@@ -317,8 +311,15 @@ Object execute(VirtualFrame frame, PythonModule thisModule, String path, PTuple
         }
 
         @Specialization
-        Object execute(VirtualFrame frame, PythonModule thisModule, PString path, PList args) {
-            return doExecute(frame, thisModule, path.getValue(), args);
+        Object executePath(VirtualFrame frame, PythonModule thisModule, Object path, PTuple args,
+                        @Cached @Shared("castToPath") CastToPathNode castToPathNode) {
+            return execute(frame, thisModule, castToPathNode.execute(frame, path), args);
+        }
+
+        @Specialization
+        Object executePath(VirtualFrame frame, PythonModule thisModule, Object path, PList args,
+                        @Cached @Shared("castToPath") CastToPathNode castToPathNode) {
+            return doExecute(frame, thisModule, castToPathNode.execute(frame, path), args);
         }
 
         Object doExecute(VirtualFrame frame, PythonModule thisModule, String path, PSequence args) {
@@ -404,8 +405,9 @@ PNone chdir(VirtualFrame frame, String spath) {
         }
 
         @Specialization
-        PNone chdirPString(VirtualFrame frame, PString spath) {
-            return chdir(frame, spath.getValue());
+        PNone chdirPath(VirtualFrame frame, Object path,
+                        @Cached CastToPathNode castToPathNode) {
+            return chdir(frame, castToPathNode.execute(frame, path));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/util/CastToPathNode.java

@@ -59,7 +59,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.ValueProfile;
 
 /**
  * Converts a Python object to a Path string
@@ -105,22 +104,22 @@ String doString(String x) {
     }
 
     @Specialization
-    String doPString(PString x) {
-        return x.getValue();
+    String doPString(PString x,
+                    @Cached CastToJavaStringNode castToJavaStringNode) {
+        return castToJavaStringNode.execute(x);
     }
 
     @Specialization(guards = {"!isString(object)", "!isBytes(object)", "!isMemoryView(object)"})
     String doObject(VirtualFrame frame, Object object,
-                    @Cached("createClassProfile()") ValueProfile resultTypeProfile,
                     @Cached PRaiseNode raise,
-                    @Cached("createFsPathCall()") LookupAndCallUnaryNode callFsPath) {
-        Object profiled = resultTypeProfile.profile(callFsPath.executeObject(frame, object));
-        if (profiled instanceof String) {
-            return (String) profiled;
-        } else if (profiled instanceof PString) {
-            return doPString((PString) profiled);
+                    @Cached("createFsPathCall()") LookupAndCallUnaryNode callFsPath,
+                    @Cached CastToJavaStringNode castToJavaStringNode) {
+        Object pathObject = callFsPath.executeObject(frame, object);
+        String path = castToJavaStringNode.execute(pathObject);
+        if (path == null) {
+            throw raise.raise(PythonBuiltinClassType.TypeError, "invalid type %p return from path-like object", pathObject);
         }
-        throw raise.raise(PythonBuiltinClassType.TypeError, "invalid type %p return from path-like object", profiled);
+        return path;
     }
 
     protected LookupAndCallUnaryNode createFsPathCall() {