ImportFromNode: use CastToJavaStringNode

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java

@@ -39,6 +39,8 @@
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
+import com.oracle.graal.python.nodes.util.CannotCastException;
+import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -49,6 +51,7 @@
 public class ImportFromNode extends AbstractImportNode {
     @Children private final WriteNode[] aslist;
     @Child private GetItemNode getItem;
+    @Child private CastToJavaStringNode castToJavaStringNode;
 
     private final String importee;
     private final int level;
@@ -98,25 +101,23 @@ public void executeVoid(VirtualFrame frame) {
                 try {
                     moduleName = pol.lookupAttributeStrict(importedModule, frame, __NAME__);
                     String pkgname;
-                    if (moduleName instanceof PString) {
-                        pkgname = ((PString) moduleName).getValue();
-                    } else if (moduleName instanceof String) {
-                        pkgname = (String) moduleName;
-                    } else {
+                    try {
+                        pkgname = ensureCastToStringNode().execute(moduleName);
+                    } catch (CannotCastException castException){
                         throw pe;
                     }
                     String fullname = PString.cat(pkgname, ".", attr);
                     PythonModule sys = getContext().getCore().lookupBuiltinModule("sys");
                     Object sysModules = pol.lookupAttribute(sys, frame, "modules");
                     assert sysModules != PNone.NO_VALUE : "ImportFromNode: sys.modules was not found!";
                     writeNode.doWrite(frame, ensureGetItemNode().execute(frame, sysModules, fullname));
-                } catch (PException e2) {
+                } catch (PException pe2) {
                     Object modulePath = "unknown location";
-                    if (!getAttrErrorProfile.profileException(e2, PythonBuiltinClassType.AttributeError)) {
+                    if (!getAttrErrorProfile.profileException(pe2, PythonBuiltinClassType.AttributeError)) {
                         try {
                             modulePath = pol.lookupAttributeStrict(importedModule, frame, __FILE__);
-                        } catch (PException e3) {
-                            e3.expectAttributeError(getFileErrorProfile);
+                        } catch (PException pe3) {
+                            pe3.expectAttributeError(getFileErrorProfile);
                         }
                     }
 
@@ -146,4 +147,12 @@ private GetItemNode ensureGetItemNode() {
         }
         return getItem;
     }
+
+    private CastToJavaStringNode ensureCastToStringNode() {
+        if (castToJavaStringNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            castToJavaStringNode = insert(CastToJavaStringNode.create());
+        }
+        return castToJavaStringNode;
+    }
 }