Set name and filename for empty code object's root node

Fixes #167

Author: msimacek

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

@@ -47,6 +47,8 @@
 import com.oracle.graal.python.nodes.IndirectCallNode;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRootNode;
+import com.oracle.graal.python.nodes.PRootNodeWithFileName;
+import com.oracle.graal.python.nodes.util.BadOPCodeNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -114,6 +116,12 @@ private PCode createCode(PythonContext context, Object cls, @SuppressWarnings("u
 
             Supplier<CallTarget> createCode = () -> {
                 RootNode rootNode = context.getCore().getSerializer().deserialize(getEmptySource(), codedata, toStringArray(cellvars), toStringArray(freevars));
+                if (rootNode instanceof BadOPCodeNode) {
+                    ((BadOPCodeNode) rootNode).setName(name);
+                }
+                if (rootNode instanceof PRootNodeWithFileName) {
+                    ((PRootNodeWithFileName) rootNode).setFileName(filename);
+                }
                 return PythonUtils.getOrCreateCallTarget(rootNode);
             };
 

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

@@ -56,6 +56,7 @@
 import com.oracle.graal.python.nodes.PClosureFunctionRootNode;
 import com.oracle.graal.python.nodes.PClosureRootNode;
 import com.oracle.graal.python.nodes.PRootNode;
+import com.oracle.graal.python.nodes.PRootNodeWithFileName;
 import com.oracle.graal.python.nodes.argument.ReadVarArgsNode;
 import com.oracle.graal.python.nodes.argument.ReadVarKeywordsNode;
 import com.oracle.graal.python.nodes.frame.FrameSlotIDs;
@@ -190,8 +191,8 @@ private static String[] extractCellVars(RootNode rootNode) {
     @TruffleBoundary
     private static void setRootNodeFileName(RootNode rootNode, String filename) {
         RootNode funcRootNode = rootNodeForExtraction(rootNode);
-        if (funcRootNode instanceof PClosureRootNode) {
-            ((PClosureRootNode) funcRootNode).setFileName(filename);
+        if (funcRootNode instanceof PRootNodeWithFileName) {
+            ((PRootNodeWithFileName) funcRootNode).setFileName(filename);
         }
     }
 
@@ -200,15 +201,15 @@ public static String extractFileName(RootNode rootNode) {
         RootNode funcRootNode = rootNodeForExtraction(rootNode);
         SourceSection src = funcRootNode.getSourceSection();
 
-        if (funcRootNode instanceof PClosureRootNode) {
-            PClosureRootNode closureRootNode = (PClosureRootNode) funcRootNode;
-            if (closureRootNode.getFileName() != null) {
+        if (funcRootNode instanceof PRootNodeWithFileName) {
+            PRootNodeWithFileName rootNodeWithFileName = (PRootNodeWithFileName) funcRootNode;
+            if (rootNodeWithFileName.getFileName() != null) {
                 // for compiled modules, _imp._fix_co_filename will set the filename
-                return closureRootNode.getFileName();
+                return rootNodeWithFileName.getFileName();
             } else if (src != null) {
                 return getSourceSectionFileName(src);
             } else {
-                return closureRootNode.getName();
+                return rootNodeWithFileName.getName();
             }
         } else if (src != null) {
             return getSourceSectionFileName(src);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java

@@ -52,8 +52,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
-public abstract class PClosureRootNode extends PRootNode {
-    private String fileName;
+public abstract class PClosureRootNode extends PRootNodeWithFileName {
     private final Assumption singleContextAssumption;
     private final boolean annotationsAvailable;
     @CompilerDirectives.CompilationFinal(dimensions = 1) protected final FrameSlot[] freeVarSlots;
@@ -129,12 +128,4 @@ public String[] getFreeVars() {
     public boolean hasAnnotations() {
         return annotationsAvailable;
     }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PRootNodeWithFileName.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.nodes;
+
+import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+
+public abstract class PRootNodeWithFileName extends PRootNode {
+    private String fileName;
+
+    public PRootNodeWithFileName(TruffleLanguage<?> language) {
+        super(language);
+    }
+
+    public PRootNodeWithFileName(TruffleLanguage<?> language, FrameDescriptor frameDescriptor) {
+        super(language, frameDescriptor);
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+}

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

@@ -44,15 +44,18 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.function.Signature;
-import com.oracle.graal.python.nodes.PRootNode;
+import com.oracle.graal.python.nodes.PRootNodeWithFileName;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class BadOPCodeNode extends PRootNode {
+public class BadOPCodeNode extends PRootNodeWithFileName {
 
-    @CompilerDirectives.CompilationFinal private TruffleLanguage.ContextReference<PythonContext> context;
+    private String name = "<invalid code>";
+
+    @CompilationFinal private TruffleLanguage.ContextReference<PythonContext> context;
 
     public BadOPCodeNode(TruffleLanguage<?> language) {
         super(language);
@@ -78,6 +81,15 @@ public Signature getSignature() {
 
     @Override
     public boolean isPythonInternal() {
-        return true;
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 }