[hotfix] [GR-13642] [GR-9307] Update jvmci and truffle imports

timfel · timfel · commit fca729629cac · 2019-02-26T06:45:54.000-08:00
PullRequest: graalpython/418
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -128,7 +128,7 @@
 
   local labsjdk8Mixin = {
     downloads +: {
-      JAVA_HOME: utils.download("labsjdk", "8u192-jvmci-0.54"),
+      JAVA_HOME: utils.download("labsjdk", "8u202-jvmci-0.55"),
       EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "11+20")] },
     },
     environment +: {
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -554,12 +554,6 @@ protected void printHelp(OptionCategory maxCategory) {
                         "GRAAL_PYTHON_OPTIONS: This environment variable can include default options that\n" +
                         "   are always passed to the launcher. These are not shell expanded and given to\n" +
                         "   the launcher as-is.");
-        if (maxCategory.compareTo(OptionCategory.DEBUG) >= 0) {
-            print("\nGraalPython performance debugging options:\n" +
-                            "-debug-perf                  : Enable tracing of Truffle compilations and its warnings\n" +
-                            "-dump                        : Enable dumping of compilation graphs to IGV\n" +
-                            "-compile-truffle-immediately : Start compiling on first invocation and throw compilation exceptions");
-        }
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java b/graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java
@@ -50,6 +50,7 @@
 import static org.graalvm.polyglot.tck.TypeDescriptor.NUMBER;
 import static org.graalvm.polyglot.tck.TypeDescriptor.OBJECT;
 import static org.graalvm.polyglot.tck.TypeDescriptor.STRING;
+import static org.graalvm.polyglot.tck.TypeDescriptor.INSTANTIABLE;
 import static org.graalvm.polyglot.tck.TypeDescriptor.array;
 import static org.graalvm.polyglot.tck.TypeDescriptor.executable;
 import static org.graalvm.polyglot.tck.TypeDescriptor.intersection;
@@ -81,6 +82,9 @@ public class PythonProvider implements LanguageProvider {
     private static final TypeDescriptor NUMBER_OBJECT = TypeDescriptor.union(NUMBER, BOOLEAN, OBJECT, array(ANY));
     private static final TypeDescriptor PSEQUENCE_OBJECT = TypeDescriptor.union(array(ANY), STRING);
 
+    // Python types are just objects
+    private static final TypeDescriptor PYTHON_TYPE = TypeDescriptor.union(OBJECT, INSTANTIABLE);
+
     public String getId() {
         return ID;
     }
@@ -268,7 +272,7 @@ public Collection<? extends Snippet> createStatements(Context context) {
         addStatementSnippet(context, snippets, "class", "class Custom0:\n" +
                                                       "    def __init__(self, val):\n" +
                                                       "        self.val = val\n" +
-                                                      "Custom0", OBJECT, ANY);
+                                                      "Custom0", PYTHON_TYPE, ANY);
         addStatementSnippet(context, snippets, "class", "class Custom1:\n" +
                                                       "    def __call__(self, val):\n" +
                                                       "        return val\n" +
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java
@@ -168,7 +168,7 @@ public void testSteppingAsExpected() throws Throwable {
             });
             expectSuspended((SuspendedEvent event) -> {
                 DebugStackFrame frame = event.getTopStackFrame();
-                assertEquals(9, frame.getSourceSection().getStartLine());
+                assertEquals(8, frame.getSourceSection().getStartLine());
                 event.prepareStepOut(1);
             });
             expectSuspended((SuspendedEvent event) -> {
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java
@@ -86,6 +86,7 @@
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.function.FunctionDefinitionNode;
 import com.oracle.graal.python.nodes.function.GeneratorExpressionNode;
+import com.oracle.graal.python.nodes.function.InnerRootNode;
 import com.oracle.graal.python.nodes.generator.DictConcatNode;
 import com.oracle.graal.python.nodes.literal.BooleanLiteralNode;
 import com.oracle.graal.python.nodes.literal.ComplexLiteralNode;
@@ -155,6 +156,8 @@ private Node unpackModuleBodyWrappers(Node n) {
             if (((WriteLocalVariableNode) n).getIdentifier().equals(FrameSlotIDs.RETURN_SLOT_ID)) {
                 actual = ((WriteLocalVariableNode) n).getRhs();
             }
+        } else if (n instanceof InnerRootNode) {
+            actual = n.getChildren().iterator().next();
         }
         if (actual == n) {
             return n;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java
@@ -204,7 +204,7 @@ private static String extractName(RootNode rootNode) {
         if (rootNode instanceof ModuleRootNode) {
             name = rootNode.getName();
         } else if (rootNode instanceof FunctionRootNode) {
-            name = ((FunctionRootNode) rootNode).getFunctionName();
+            name = ((FunctionRootNode) rootNode).getName();
         } else {
             name = rootNode.getName();
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java
@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.objects.exception;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -61,6 +60,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -191,8 +191,8 @@ public List<TruffleStackTraceElement> getStackTrace() {
     @TruffleBoundary
     public void reifyException() {
         if (stackTrace == null && traceback == null) {
-            TruffleStackTraceElement.fillIn(exception);
-            stackTrace = new ArrayList<>(TruffleStackTraceElement.getStackTrace(exception));
+            TruffleStackTrace.fillIn(exception);
+            stackTrace = TruffleStackTrace.getStacktrace(exception);
             Iterator<TruffleStackTraceElement> iter = stackTrace.iterator();
             while (iter.hasNext()) {
                 TruffleStackTraceElement element = iter.next();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ModuleRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ModuleRootNode.java
@@ -28,6 +28,7 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.WriteGlobalNode;
+import com.oracle.graal.python.nodes.function.InnerRootNode;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -49,7 +50,7 @@ public ModuleRootNode(PythonLanguage language, String name, String doc, Expressi
         super(language, descriptor, freeVarSlots);
         this.name = "<module '" + name + "'>";
         this.doc = doc;
-        this.body = file;
+        this.body = new InnerRootNode(this, file);
     }
 
     private WriteGlobalNode getWriteModuleDoc() {
@@ -62,15 +63,15 @@ private WriteGlobalNode getWriteModuleDoc() {
 
     @Override
     public Object execute(VirtualFrame frame) {
+        return body.execute(frame);
+    }
+
+    @Override
+    public void initializeFrame(VirtualFrame frame) {
         addClosureCellsToLocals(frame);
         if (doc != null) {
             getWriteModuleDoc().doWrite(frame, doc);
         }
-        return body.execute(frame);
-    }
-
-    public ExpressionNode getBody() {
-        return body;
     }
 
     @Override
@@ -84,10 +85,6 @@ public String getName() {
         return name;
     }
 
-    public String getDoc() {
-        return doc;
-    }
-
     @Override
     public SourceSection getSourceSection() {
         return body.getSourceSection();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java
@@ -134,18 +134,15 @@ public <T> T duplicate(Node orig, Class<T> clazz) {
     }
 
     public ModuleRootNode createModuleRoot(String name, String doc, ExpressionNode file, FrameDescriptor fd) {
-        file.markAsRoot();
         return new ModuleRootNode(language, name, doc, file, fd, null);
     }
 
     public FunctionRootNode createFunctionRoot(SourceSection sourceSection, String functionName, boolean isGenerator, FrameDescriptor frameDescriptor, ExpressionNode body,
                     ExecutionCellSlots cellSlots) {
-        body.markAsRoot();
         return new FunctionRootNode(language, sourceSection, functionName, isGenerator, frameDescriptor, body, cellSlots);
     }
 
     public ClassBodyRootNode createClassBodyRoot(SourceSection sourceSection, String functionName, FrameDescriptor frameDescriptor, ExpressionNode body, ExecutionCellSlots cellSlots) {
-        body.markAsRoot();
         return new ClassBodyRootNode(language, sourceSection, functionName, frameDescriptor, body, cellSlots);
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PClosureRootNode.java
@@ -47,6 +47,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
 public abstract class PClosureRootNode extends PRootNode {
@@ -89,6 +90,8 @@ public boolean hasFreeVars() {
         return freeVarSlots != null && freeVarSlots.length > 0;
     }
 
+    public abstract void initializeFrame(VirtualFrame frame);
+
     public String[] getFreeVars() {
         if (freeVarSlots != null) {
             String[] freeVars = new String[freeVarSlots.length];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -32,18 +32,13 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode;
-import com.oracle.truffle.api.instrumentation.StandardTags;
-import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.source.SourceSection;
 
 @TypeSystemReference(PythonTypes.class)
 @ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, BuiltinNames.class})
 public abstract class PNode extends PNodeWithContext implements InstrumentableNode {
-
     public static final PNode[] EMPTY_ARRAY = new PNode[0];
-
     @CompilationFinal private SourceSection sourceSection;
-    @CompilationFinal private boolean isRoot = false;
 
     @Override
     public String toString() {
@@ -68,19 +63,7 @@ public void assignSourceSection(SourceSection source) {
         this.sourceSection = source;
     }
 
-    public boolean hasTag(Class<? extends Tag> tag) {
-        return isRoot && tag == StandardTags.RootTag.class;
-    }
-
     public boolean isInstrumentable() {
         return getSourceSection() != null;
     }
-
-    public void markAsRoot() {
-        isRoot = true;
-    }
-
-    public boolean isRoot() {
-        return isRoot;
-    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java
@@ -73,23 +73,11 @@ public FunctionRootNode(PythonLanguage language, SourceSection sourceSection, St
         assert sourceSection != null;
         this.functionName = functionName;
         this.isGenerator = isGenerator;
-        this.body = NodeUtil.cloneNode(body);
+        this.body = new InnerRootNode(this, NodeUtil.cloneNode(body));
         this.uninitializedBody = NodeUtil.cloneNode(body);
         this.generatorFrameProfile = isGenerator ? ValueProfile.createClassProfile() : null;
     }
 
-    public String getFunctionName() {
-        return functionName;
-    }
-
-    public ExpressionNode getBody() {
-        return body;
-    }
-
-    public ExpressionNode getUninitializedBody() {
-        return uninitializedBody;
-    }
-
     @Override
     public String getName() {
         return functionName;
@@ -145,7 +133,6 @@ public Object execute(VirtualFrame frame) {
         if (CompilerDirectives.inInterpreter() || CompilerDirectives.inCompilationRoot()) {
             contextRef.get().triggerAsyncActions();
         }
-        initClosureAndCellVars(frame);
         return body.execute(frame);
     }
 
@@ -167,4 +154,9 @@ public boolean isRewritten() {
     public void setRewritten() {
         this.isRewritten = true;
     }
+
+    @Override
+    public void initializeFrame(VirtualFrame frame) {
+        initClosureAndCellVars(frame);
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/InnerRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/InnerRootNode.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, 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.function;
+
+import com.oracle.graal.python.nodes.PClosureRootNode;
+import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.StandardTags;
+import com.oracle.truffle.api.instrumentation.Tag;
+
+/**
+ * The sole purpose of this class is to handle the pre-amble of the root node, so that frame
+ * restarting works when instrumented.
+ */
+public class InnerRootNode extends ExpressionNode {
+    @Child private ExpressionNode body;
+    private final PClosureRootNode root;
+
+    public InnerRootNode(PClosureRootNode functionRootNode, ExpressionNode body) {
+        this.body = body;
+        this.assignSourceSection(body.getSourceSection());
+        this.root = functionRootNode;
+    }
+
+    @Override
+    public Object execute(VirtualFrame frame) {
+        root.initializeFrame(frame);
+        return body.execute(frame);
+    }
+
+    @Override
+    public boolean hasTag(Class<? extends Tag> tag) {
+        return StandardTags.RootTag.class == tag;
+    }
+
+    @Override
+    public boolean hasSideEffectAsAnExpression() {
+        return true;
+    }
+}
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorFunctionRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorFunctionRootNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -87,4 +87,9 @@ public RootNode getFunctionRootNode() {
     public String getName() {
         return name;
     }
+
+    @Override
+    public void initializeFrame(VirtualFrame frame) {
+        // nothing to do
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/GeneratorTranslator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/GeneratorTranslator.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ExceptionUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ExceptionUtils.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private static String extractName(RootNode rootNode) {`
`204`	`204`	`if (rootNode instanceof ModuleRootNode) {`
`205`	`205`	`name = rootNode.getName();`
`206`	`206`	`} else if (rootNode instanceof FunctionRootNode) {`
`207`		`- name = ((FunctionRootNode) rootNode).getFunctionName();`
	`207`	`+ name = ((FunctionRootNode) rootNode).getName();`
`208`	`208`	`} else {`
`209`	`209`	`name = rootNode.getName();`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,18 +134,15 @@ public <T> T duplicate(Node orig, Class<T> clazz) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`public ModuleRootNode createModuleRoot(String name, String doc, ExpressionNode file, FrameDescriptor fd) {`
`137`		`- file.markAsRoot();`
`138`	`137`	`return new ModuleRootNode(language, name, doc, file, fd, null);`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`public FunctionRootNode createFunctionRoot(SourceSection sourceSection, String functionName, boolean isGenerator, FrameDescriptor frameDescriptor, ExpressionNode body,`
`142`	`141`	`ExecutionCellSlots cellSlots) {`
`143`		`- body.markAsRoot();`
`144`	`142`	`return new FunctionRootNode(language, sourceSection, functionName, isGenerator, frameDescriptor, body, cellSlots);`
`145`	`143`	`}`
`146`	`144`
`147`	`145`	`public ClassBodyRootNode createClassBodyRoot(SourceSection sourceSection, String functionName, FrameDescriptor frameDescriptor, ExpressionNode body, ExecutionCellSlots cellSlots) {`
`148`		`- body.markAsRoot();`
`149`	`146`	`return new ClassBodyRootNode(language, sourceSection, functionName, frameDescriptor, body, cellSlots);`
`150`	`147`	`}`
`151`	`148`