use executeVoid whereever possible (in preparation of splitting statements/expressions)

lukasstadler · lukasstadler · commit 4c49b79c99cc · 2018-08-13T12:28:42.000+02:00
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
@@ -176,7 +176,7 @@ public LoopNode createWhile(CastToBooleanNode condition, PNode body) {
     }
 
     public StatementNode createIf(CastToBooleanNode condition, PNode thenPart, PNode elsePart) {
-        return IfNode.create(condition, thenPart, elsePart);
+        return new IfNode(condition, thenPart, elsePart);
     }
 
     public GetIteratorNode createGetIterator(PNode collection) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ElseNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ElseNode.java
@@ -49,7 +49,7 @@ public PNode getOrelse() {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        then.execute(frame);
+        then.executeVoid(frame);
         return orelse.execute(frame);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/IfNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/IfNode.java
@@ -30,21 +30,18 @@
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class IfNode extends StatementNode {
-    @Child protected CastToBooleanNode condition;
-    @Child protected PNode then;
-    @Child protected PNode orelse;
+public final class IfNode extends StatementNode {
+
+    @Child private CastToBooleanNode condition;
+    @Child private PNode then;
+    @Child private PNode orelse;
 
     public IfNode(CastToBooleanNode condition, PNode then, PNode orelse) {
         this.condition = condition;
         this.then = then;
         this.orelse = orelse;
     }
 
-    public static IfNode create(CastToBooleanNode condition, PNode then, PNode orelse) {
-        return new IfNode(condition, then, orelse);
-    }
-
     public CastToBooleanNode getCondition() {
         return condition;
     }
@@ -65,4 +62,13 @@ public Object execute(VirtualFrame frame) {
             return orelse.execute(frame);
         }
     }
+
+    @Override
+    public void executeVoid(VirtualFrame frame) {
+        if (condition.executeBoolean(frame)) {
+            then.executeVoid(frame);
+        } else {
+            orelse.executeVoid(frame);
+        }
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ReturnNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ReturnNode.java
@@ -51,7 +51,7 @@ public PNode getRight() {
 
         @Override
         public Object execute(VirtualFrame frame) {
-            right.execute(frame);
+            right.executeVoid(frame);
             throw ReturnException.INSTANCE;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ReturnTargetNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ReturnTargetNode.java
@@ -30,21 +30,21 @@
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.runtime.exception.ReturnException;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 
-public class ReturnTargetNode extends StatementNode {
+public final class ReturnTargetNode extends StatementNode {
 
-    @Child protected PNode body;
-    @Child protected PNode returnValue;
+    @Child private PNode body;
+    @Child private PNode returnValue;
+
+    private final BranchProfile returnProfile = BranchProfile.create();
+    private final BranchProfile fallthroughProfile = BranchProfile.create();
 
     public ReturnTargetNode(PNode body, PNode returnValue) {
         this.body = body;
         this.returnValue = returnValue;
     }
 
-    protected ReturnTargetNode(ReturnTargetNode prev) {
-        this(prev.body, prev.returnValue);
-    }
-
     public PNode getBody() {
         return body;
     }
@@ -56,10 +56,12 @@ public PNode getReturn() {
     @Override
     public Object execute(VirtualFrame frame) {
         try {
-            body.execute(frame);
+            body.executeVoid(frame);
+            fallthroughProfile.enter();
+            return PNone.NONE;
         } catch (ReturnException ire) {
+            returnProfile.enter();
             return returnValue.execute(frame);
         }
-        return PNone.NONE;
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/WhileNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/WhileNode.java
@@ -49,7 +49,7 @@ public boolean executeRepeating(VirtualFrame frame) {
         if (!condition.executeBoolean(frame)) {
             return false;
         }
-        body.execute(frame);
+        body.executeVoid(frame);
         return true;
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorIfNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorIfNode.java
@@ -28,16 +28,19 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.EmptyNode;
 import com.oracle.graal.python.nodes.PNode;
-import com.oracle.graal.python.nodes.control.IfNode;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
+import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.runtime.exception.YieldException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-public class GeneratorIfNode extends IfNode implements GeneratorControlNode {
+public class GeneratorIfNode extends StatementNode implements GeneratorControlNode {
 
     @Child protected GeneratorAccessNode gen = GeneratorAccessNode.create();
+    @Child protected CastToBooleanNode condition;
+    @Child protected PNode then;
+    @Child protected PNode orelse;
 
     protected final int thenFlagSlot;
     protected final int elseFlagSlot;
@@ -48,7 +51,9 @@ public class GeneratorIfNode extends IfNode implements GeneratorControlNode {
     protected final BranchProfile seenYield = BranchProfile.create();
 
     public GeneratorIfNode(CastToBooleanNode condition, PNode then, PNode orelse, int thenFlagSlot, int elseFlagSlot) {
-        super(condition, then, orelse);
+        this.condition = condition;
+        this.then = then;
+        this.orelse = orelse;
         this.thenFlagSlot = thenFlagSlot;
         this.elseFlagSlot = elseFlagSlot;
     }
@@ -61,14 +66,6 @@ public static GeneratorIfNode create(CastToBooleanNode condition, PNode then, PN
         }
     }
 
-    public int getThenFlagSlot() {
-        return thenFlagSlot;
-    }
-
-    public int getElseFlagSlot() {
-        return elseFlagSlot;
-    }
-
     @Override
     public Object execute(VirtualFrame frame) {
         boolean startThenFlag = gen.isActive(frame, thenFlagSlot);
@@ -82,9 +79,9 @@ public Object execute(VirtualFrame frame) {
                 thenFlag = condition.executeBoolean(frame);
             }
             if (thenFlag) {
-                then.execute(frame);
+                then.executeVoid(frame);
             } else {
-                orelse.execute(frame);
+                orelse.executeVoid(frame);
             }
             return PNone.NONE;
         } catch (YieldException e) {
@@ -122,7 +119,7 @@ public Object execute(VirtualFrame frame) {
                     thenFlag = condition.executeBoolean(frame);
                 }
                 if (thenFlag) {
-                    then.execute(frame);
+                    then.executeVoid(frame);
                 }
                 return PNone.NONE;
             } catch (YieldException e) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorReturnTargetNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorReturnTargetNode.java
@@ -28,20 +28,28 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.StopIteration;
 
 import com.oracle.graal.python.nodes.PNode;
-import com.oracle.graal.python.nodes.control.ReturnTargetNode;
+import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.runtime.exception.ReturnException;
 import com.oracle.graal.python.runtime.exception.YieldException;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.BranchProfile;
 
-public final class GeneratorReturnTargetNode extends ReturnTargetNode implements GeneratorControlNode {
+public final class GeneratorReturnTargetNode extends StatementNode implements GeneratorControlNode {
 
+    @Child private PNode body;
+    @Child private PNode returnValue;
     @Child private PNode parameters;
     @Child private GeneratorAccessNode gen = GeneratorAccessNode.create();
 
+    private final BranchProfile returnProfile = BranchProfile.create();
+    private final BranchProfile fallthroughProfile = BranchProfile.create();
+    private final BranchProfile yieldProfile = BranchProfile.create();
+
     private final int flagSlot;
 
     public GeneratorReturnTargetNode(PNode parameters, PNode body, PNode returnValue, int activeFlagIndex) {
-        super(body, returnValue);
+        this.body = body;
+        this.returnValue = returnValue;
         this.parameters = parameters;
         this.flagSlot = activeFlagIndex;
     }
@@ -58,11 +66,14 @@ public Object execute(VirtualFrame frame) {
         }
 
         try {
-            body.execute(frame);
+            body.executeVoid(frame);
+            fallthroughProfile.enter();
         } catch (YieldException eye) {
+            yieldProfile.enter();
             return returnValue.execute(frame);
         } catch (ReturnException ire) {
             // return statement in generators throws StopIteration.
+            returnProfile.enter();
         }
 
         throw raise(StopIteration);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryExceptNode.java
@@ -82,7 +82,7 @@ public Object execute(VirtualFrame frame) {
         }
 
         try {
-            getBody().execute(frame);
+            getBody().executeVoid(frame);
         } catch (PException ex) {
             gen.setActive(frame, exceptFlag, true);
             gen.setActiveException(frame, ex);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryFinallyNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryFinallyNode.java
@@ -62,15 +62,15 @@ public Object execute(VirtualFrame frame) {
         PException exceptionState = getContext().getCurrentException();
         PException exception = null;
         if (gen.isActive(frame, finallyFlag)) {
-            getFinalbody().execute(frame);
+            getFinalbody().executeVoid(frame);
         } else {
             try {
-                getBody().execute(frame);
+                getBody().executeVoid(frame);
             } catch (PException e) {
                 exception = e;
             }
             gen.setActive(frame, finallyFlag, true);
-            getFinalbody().execute(frame);
+            getFinalbody().executeVoid(frame);
         }
         reset(frame);
         if (exception != null) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssignmentNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssignmentNode.java
@@ -63,14 +63,14 @@ public AssignmentNode(PNode assignment, PNode pNode) {
 
     public Object doWrite(VirtualFrame frame, Object value) {
         ((WriteNode) writeTemp).doWrite(frame, value);
-        assignment.execute(frame);
+        assignment.executeVoid(frame);
         return PNone.NONE;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        writeTemp.execute(frame);
-        assignment.execute(frame);
+        writeTemp.executeVoid(frame);
+        assignment.executeVoid(frame);
         return PNone.NONE;
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ExceptNode.java
@@ -59,7 +59,7 @@ public ExceptNode(ExceptNode original) {
     public void executeExcept(VirtualFrame frame, PException e) {
         PythonContext context = getContext();
         context.setCurrentException(e);
-        body.execute(frame);
+        body.executeVoid(frame);
         throw ExceptionHandledException.INSTANCE;
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -65,7 +65,7 @@ public Object execute(VirtualFrame frame) {
         // store current exception state for later restore
         PException exceptionState = getContext().getCurrentException();
         try {
-            body.execute(frame);
+            body.executeVoid(frame);
         } catch (PException ex) {
             catchException(frame, ex, exceptionState);
             return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryFinallyNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryFinallyNode.java
@@ -47,14 +47,14 @@ public Object execute(VirtualFrame frame) {
         PythonContext context = getContext();
         PException exceptionState = context.getCurrentException();
         try {
-            body.execute(frame);
+            body.executeVoid(frame);
         } catch (PException e) {
             // any thrown Python exception is visible in the finally block
             context.setCurrentException(e);
             throw e;
         } finally {
             try {
-                finalbody.execute(frame);
+                finalbody.executeVoid(frame);
             } catch (ControlFlowException e) {
                 // restore
                 context.setCurrentException(exceptionState);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/WithNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/WithNode.java
@@ -102,7 +102,7 @@ protected Object runWith(VirtualFrame frame, Object withObject,
         }
 
         try {
-            body.execute(frame);
+            body.executeVoid(frame);
         } catch (PException exception) {
             gotException = true;
             return handleException(frame, withObject, exitCallable, exception, isExitCallableNode);

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public LoopNode createWhile(CastToBooleanNode condition, PNode body) {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`public StatementNode createIf(CastToBooleanNode condition, PNode thenPart, PNode elsePart) {`
`179`		`- return IfNode.create(condition, thenPart, elsePart);`
	`179`	`+ return new IfNode(condition, thenPart, elsePart);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public GetIteratorNode createGetIterator(PNode collection) {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public PNode getOrelse() {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public Object execute(VirtualFrame frame) {`
`52`		`- then.execute(frame);`
	`52`	`+ then.executeVoid(frame);`
`53`	`53`	`return orelse.execute(frame);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public PNode getRight() {`
`51`	`51`
`52`	`52`	`@Override`
`53`	`53`	`public Object execute(VirtualFrame frame) {`
`54`		`- right.execute(frame);`
	`54`	`+ right.executeVoid(frame);`
`55`	`55`	`throw ReturnException.INSTANCE;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public boolean executeRepeating(VirtualFrame frame) {`
`49`	`49`	`if (!condition.executeBoolean(frame)) {`
`50`	`50`	`return false;`
`51`	`51`	`}`
`52`		`- body.execute(frame);`
	`52`	`+ body.executeVoid(frame);`
`53`	`53`	`return true;`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Object execute(VirtualFrame frame) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`try {`
`85`		`- getBody().execute(frame);`
	`85`	`+ getBody().executeVoid(frame);`
`86`	`86`	`} catch (PException ex) {`
`87`	`87`	`gen.setActive(frame, exceptFlag, true);`
`88`	`88`	`gen.setActiveException(frame, ex);`