Fix virtual invokes in marshal module and code object

Author: timfel

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

@@ -73,6 +73,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -248,6 +249,7 @@ abstract static class MarshallerNode extends PNodeWithState {
 
         public abstract void execute(VirtualFrame frame, Object x, int version, DataOutputStream buffer);
 
+        @Child private CastToJavaStringNode castStrNode;
         @Child private MarshallerNode recursiveNode;
         private int depth = 0;
         private IsBuiltinClassProfile isBuiltinProfile;
@@ -476,12 +478,16 @@ private PTuple internStrings(Object[] values) {
             } else {
                 interned = new Object[values.length];
                 for (int i = 0; i < interned.length; i++) {
-                    if (values[i] instanceof String) {
-                        interned[i] = new InternedString((String) values[i]);
-                    } else if (values[i] instanceof PString) {
-                        interned[i] = new InternedString(((PString) values[i]).getValue());
+                    if (castStrNode == null) {
+                        CompilerDirectives.transferToInterpreterAndInvalidate();
+                        castStrNode = insert(CastToJavaStringNode.create());
+                    }
+                    Object value = values[i];
+                    String strValue = castStrNode.execute(value);
+                    if (strValue != null) {
+                        interned[i] = new InternedString(strValue);
                     } else {
-                        interned[i] = values[i];
+                        interned[i] = value;
                     }
                 }
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -64,7 +64,6 @@
 import com.oracle.graal.python.nodes.function.GeneratorExpressionNode;
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.graal.python.nodes.literal.SimpleLiteralNode;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -173,16 +172,10 @@ private static String[] extractCellVars(RootNode rootNode) {
         }
     }
 
+    @TruffleBoundary
     private static String extractFileName(RootNode rootNode) {
         RootNode funcRootNode = rootNodeForExtraction(rootNode);
-        SourceSection src;
-        if (funcRootNode instanceof PRootNode) {
-            src = ((PRootNode) funcRootNode).getSourceSection();
-        } else {
-            // foreign root nodes might consider getting the source section slow-path
-            CompilerDirectives.transferToInterpreter();
-            src = funcRootNode.getSourceSection();
-        }
+        SourceSection src = funcRootNode.getSourceSection();
         if (src != null) {
             if (src.getSource().getPath() == null) {
                 return src.getSource().getName();
@@ -205,10 +198,12 @@ private static int extractFirstLineno(RootNode rootNode) {
         return 1;
     }
 
+    @TruffleBoundary
     private static String extractName(RootNode rootNode) {
         return rootNode.getName();
     }
 
+    @TruffleBoundary
     private static int extractStackSize(RootNode rootNode) {
         return rootNode.getFrameDescriptor().getSize();
     }
@@ -477,20 +472,9 @@ public SourceSection getSourceLocation() throws UnsupportedMessageException {
         }
     }
 
-    private SourceSection readSourceLocation() {
-        RootNode rootNode = getRootNode();
-        SourceSection result;
-        if (rootNode instanceof PRootNode) {
-            result = ((PRootNode) rootNode).getSourceSection();
-        } else {
-            result = getForeignSourceSection(rootNode);
-        }
-        return result;
-    }
-
     @TruffleBoundary
-    private static SourceSection getForeignSourceSection(RootNode rootNode) {
-        return rootNode.getSourceSection();
+    private SourceSection readSourceLocation() {
+        return getRootNode().getSourceSection();
     }
 
     @ExportMessage

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

@@ -109,6 +109,10 @@ static boolean isMaterialized(PString x) {
         return x.getCharSequence() instanceof String;
     }
 
+    public static CastToJavaStringNode create() {
+        return CastToJavaStringNodeGen.create();
+    }
+
     public static CastToJavaStringNode getUncached() {
         return CastToJavaStringNodeGen.getUncached();
     }