push code down from PNode into StatementNode or ExpressionNode

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -154,7 +154,7 @@ <T> T parseAs(String src, Class<? extends T> klass) {
     }
 
     Object literalAs(String src, Class<? extends PNode> klass) {
-        PNode firstChild = parseAs(src, klass);
+        ExpressionNode firstChild = (ExpressionNode) parseAs(src, klass);
         return firstChild.execute(null);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -47,6 +47,7 @@
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.call.InvokeNode;
 import com.oracle.graal.python.nodes.control.TopLevelExceptionHandler;
+import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.parser.PythonParserImpl;
@@ -81,7 +82,8 @@
 import com.oracle.truffle.api.source.Source.SourceBuilder;
 
 @TruffleLanguage.Registration(id = PythonLanguage.ID, name = PythonLanguage.NAME, version = PythonLanguage.VERSION, mimeType = PythonLanguage.MIME_TYPE, interactive = true, internal = false, contextPolicy = TruffleLanguage.ContextPolicy.SHARED)
-@ProvidedTags({StandardTags.CallTag.class, StandardTags.StatementTag.class, StandardTags.RootTag.class, StandardTags.TryBlockTag.class, DebuggerTags.AlwaysHalt.class})
+@ProvidedTags({StandardTags.CallTag.class, StandardTags.StatementTag.class, StandardTags.RootTag.class, StandardTags.TryBlockTag.class, StandardTags.ExpressionTag.class,
+                DebuggerTags.AlwaysHalt.class})
 public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final String ID = "python";
     public static final String NAME = "Python";
@@ -250,7 +252,7 @@ protected ExecutableNode parse(InlineParsingRequest request) throws Exception {
         final ExecutableNode executableNode = new ExecutableNode(this) {
             private final ContextReference<PythonContext> contextRef = getContextReference();
             @CompilationFinal private volatile PythonContext cachedContext;
-            @Child private PNode expression;
+            @Child private ExpressionNode expression;
 
             @Override
             public Object execute(VirtualFrame frame) {
@@ -280,17 +282,17 @@ private void parseAndCache(PythonContext context) {
 
             @TruffleBoundary
             private Object parseAndEval(PythonContext context, MaterializedFrame frame) {
-                PNode fragment = parseInline(source, context, frame);
+                ExpressionNode fragment = parseInline(source, context, frame);
                 return fragment.execute(frame);
             }
         };
         return executableNode;
     }
 
     @TruffleBoundary
-    protected static PNode parseInline(Source code, PythonContext context, MaterializedFrame lexicalContextFrame) {
+    protected static ExpressionNode parseInline(Source code, PythonContext context, MaterializedFrame lexicalContextFrame) {
         PythonCore pythonCore = context.getCore();
-        return (PNode) pythonCore.getParser().parse(ParserMode.InlineEvaluation, pythonCore, code, lexicalContextFrame);
+        return (ExpressionNode) pythonCore.getParser().parse(ParserMode.InlineEvaluation, pythonCore, code, lexicalContextFrame);
     }
 
     @Override

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

@@ -26,9 +26,10 @@
 
 package com.oracle.graal.python.nodes;
 
+import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.truffle.api.frame.*;
 
-public final class GraalPythonTranslationErrorNode extends PNode {
+public final class GraalPythonTranslationErrorNode extends ExpressionNode {
 
     public static final String MESSAGE = "GraalPythonTranslationError";
 

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

@@ -25,33 +25,25 @@
  */
 package com.oracle.graal.python.nodes;
 
-import com.oracle.graal.python.nodes.statement.TryExceptNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.GenerateWrapper;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode;
-import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
-import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
 
 @TypeSystemReference(PythonTypes.class)
 @ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, BuiltinNames.class})
-@GenerateWrapper
 public abstract class PNode extends PNodeWithContext implements InstrumentableNode {
 
     public static final PNode[] EMPTY_ARRAY = new PNode[0];
 
     @CompilationFinal private SourceSection sourceSection;
-    @CompilationFinal private boolean isStmt = false;
     @CompilationFinal private boolean isRoot = false;
-    @CompilationFinal private boolean isTryBlock = false;
 
     @Override
     public String toString() {
@@ -68,44 +60,6 @@ public SourceSection getSourceSection() {
         return this.sourceSection;
     }
 
-    public abstract Object execute(VirtualFrame frame);
-
-    public int executeInt(VirtualFrame frame) throws UnexpectedResultException {
-        Object value = execute(frame);
-        if (value instanceof Integer) {
-            return (int) value;
-        }
-        throw new UnexpectedResultException(value);
-    }
-
-    public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
-        Object value = execute(frame);
-        if (value instanceof Long) {
-            return (long) value;
-        }
-        throw new UnexpectedResultException(value);
-    }
-
-    public double executeDouble(VirtualFrame frame) throws UnexpectedResultException {
-        Object o = execute(frame);
-        if (o instanceof Double) {
-            return (double) o;
-        }
-        throw new UnexpectedResultException(o);
-    }
-
-    public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
-        Object o = execute(frame);
-        if (o instanceof Boolean) {
-            return (boolean) o;
-        }
-        throw new UnexpectedResultException(o);
-    }
-
-    public boolean hasSideEffectAsAnExpression() {
-        return false;
-    }
-
     public void clearSourceSection() {
         this.sourceSection = null;
     }
@@ -115,50 +69,18 @@ public void assignSourceSection(SourceSection source) {
     }
 
     public boolean hasTag(Class<? extends Tag> tag) {
-        return (isStmt && tag == StandardTags.StatementTag.class) || (isRoot && tag == StandardTags.RootTag.class) || (isTryBlock && tag == StandardTags.TryBlockTag.class);
-    }
-
-    public WrapperNode createWrapper(ProbeNode probeNode) {
-        return new PNodeWrapper(this, probeNode);
+        return isRoot && tag == StandardTags.RootTag.class;
     }
 
     public boolean isInstrumentable() {
         return getSourceSection() != null;
     }
 
-    public boolean isStatement() {
-        return isStmt;
-    }
-
-    public void markAsStatement() {
-        isStmt = true;
-    }
-
     public void markAsRoot() {
         isRoot = true;
     }
 
     public boolean isRoot() {
         return isRoot;
     }
-
-    public void markAsTryBlock() {
-        isTryBlock = true;
-    }
-
-    public boolean isTryBlock() {
-        return isTryBlock;
-    }
-
-    public Object getNodeObject() {
-        if (isTryBlock) {
-            if (this.getParent() instanceof TryExceptNode) {
-                return this.getParent();
-            } else if (this.getParent() instanceof PNodeWrapper) {
-                assert this.getParent().getParent() instanceof TryExceptNode;
-                return this.getParent().getParent();
-            }
-        }
-        return null;
-    }
 }

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

@@ -86,9 +86,6 @@ public static void clearSourceSections(PNode node) {
     }
 
     public static <T extends PNode> T replace(PNode oldNode, T node) {
-        if (oldNode.isStatement()) {
-            node.markAsStatement();
-        }
         node.assignSourceSection(oldNode.getSourceSection());
         return oldNode.replace(node);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/positional/PositionalArgumentsNode.java

@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.nodes.argument.positional;
 
-import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -72,7 +71,7 @@ public static Object[] prependArgument(Object primary, Object[] arguments, int a
     }
 
     @ExplodeLoop
-    public static Object[] evaluateArguments(VirtualFrame frame, PNode[] arguments) {
+    public static Object[] evaluateArguments(VirtualFrame frame, ExpressionNode[] arguments) {
         CompilerAsserts.compilationConstant(arguments);
         Object[] values = new Object[arguments.length];
         for (int i = 0; i < arguments.length; i++) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteCellVarNode.java

@@ -26,7 +26,7 @@
 package com.oracle.graal.python.nodes.cell;
 
 import com.oracle.graal.python.builtins.objects.cell.PCell;
-import com.oracle.graal.python.nodes.PNode;
+import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameSlot;
@@ -37,9 +37,9 @@
 public abstract class WriteCellVarNode extends StatementNode {
     private int cellIndex = -1;
     private final CellSupplier cellSupplier;
-    @Child private PNode readNode;
+    @Child private ExpressionNode readNode;
 
-    WriteCellVarNode(PNode readNode, CellSupplier cellSupplier, String identifier) {
+    WriteCellVarNode(ExpressionNode readNode, CellSupplier cellSupplier, String identifier) {
         this.readNode = readNode;
         this.cellSupplier = cellSupplier;
 
@@ -53,7 +53,7 @@ public abstract class WriteCellVarNode extends StatementNode {
         }
     }
 
-    public static WriteCellVarNode create(PNode readNode, CellSupplier cellSupplier, String identifier) {
+    public static WriteCellVarNode create(ExpressionNode readNode, CellSupplier cellSupplier, String identifier) {
         return WriteCellVarNodeGen.create(readNode, cellSupplier, identifier);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/DeleteClassAttributeNode.java

@@ -93,6 +93,6 @@ void deleteFromLocals(@SuppressWarnings("unused") VirtualFrame frame,
     @Specialization
     void delete(VirtualFrame frame) {
         // delete attribute actual attribute
-        deleteNsItem.execute(frame);
+        deleteNsItem.executeVoid(frame);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/StopIterationTargetNode.java

@@ -53,10 +53,10 @@ public StatementNode getCatchPart() {
     @Override
     public void executeVoid(VirtualFrame frame) {
         try {
-            tryPart.execute(frame);
+            tryPart.executeVoid(frame);
         } catch (PException ex) {
             ex.expectStopIteration(getCore(), errorProfile);
-            catchPart.execute(frame);
+            catchPart.executeVoid(frame);
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/ExpressionNode.java

@@ -3,9 +3,63 @@
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.GenerateWrapper;
+import com.oracle.truffle.api.instrumentation.ProbeNode;
+import com.oracle.truffle.api.instrumentation.StandardTags.ExpressionTag;
+import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.NodeCost;
+import com.oracle.truffle.api.nodes.UnexpectedResultException;
 
+@GenerateWrapper
 public abstract class ExpressionNode extends PNode {
+
+    public abstract Object execute(VirtualFrame frame);
+
+    public int executeInt(VirtualFrame frame) throws UnexpectedResultException {
+        Object value = execute(frame);
+        if (value instanceof Integer) {
+            return (int) value;
+        }
+        throw new UnexpectedResultException(value);
+    }
+
+    public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
+        Object value = execute(frame);
+        if (value instanceof Long) {
+            return (long) value;
+        }
+        throw new UnexpectedResultException(value);
+    }
+
+    public double executeDouble(VirtualFrame frame) throws UnexpectedResultException {
+        Object o = execute(frame);
+        if (o instanceof Double) {
+            return (double) o;
+        }
+        throw new UnexpectedResultException(o);
+    }
+
+    public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
+        Object o = execute(frame);
+        if (o instanceof Boolean) {
+            return (boolean) o;
+        }
+        throw new UnexpectedResultException(o);
+    }
+
+    public boolean hasSideEffectAsAnExpression() {
+        return false;
+    }
+
+    public WrapperNode createWrapper(ProbeNode probe) {
+        return new ExpressionNodeWrapper(this, probe);
+    }
+
+    @Override
+    public boolean hasTag(Class<? extends Tag> tag) {
+        return tag == ExpressionTag.class || super.hasTag(tag);
+    }
+
     public static final class ExpressionStatementNode extends StatementNode {
         @Child private ExpressionNode node;