Fix style

Author: steve-s

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

@@ -28,8 +28,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.PNode;
 import com.oracle.graal.python.nodes.frame.WriteFrameSlotNode;
-import com.oracle.graal.python.nodes.expression.ExpressionNode;
-import com.oracle.graal.python.nodes.frame.WriteIdentifierNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.runtime.exception.ReturnException;
 import com.oracle.truffle.api.frame.VirtualFrame;

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

@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.nodes.control;
 
-import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.runtime.exception.ReturnException;
@@ -37,7 +36,6 @@ public final class ReturnTargetNode extends ExpressionNode {
     @Child private ExpressionNode returnValue;
 
     private final BranchProfile returnProfile = BranchProfile.create();
-    private final BranchProfile fallthroughProfile = BranchProfile.create();
 
     public ReturnTargetNode(StatementNode body, ExpressionNode returnValue) {
         this.body = body;
@@ -57,9 +55,8 @@ public Object execute(VirtualFrame frame) {
         try {
             return body.returnExecute(frame);
         } catch (ReturnException ire) {
-            // fall-though
+            returnProfile.enter();
+            return returnValue.execute(frame);
         }
-        returnProfile.enter();
-        return returnValue.execute(frame);
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorBlockNode.java

@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.nodes.generator;
 
-import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.control.BaseBlockNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.parser.GeneratorInfo;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/StatementNode.java

@@ -27,6 +27,8 @@
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.nodes.PNode;
+import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -35,11 +37,13 @@
 import com.oracle.truffle.api.instrumentation.Tag;
 
 /**
- * Base class for all statements. Statements never return a value.
+ * Base class for all statements. Statements normally never return a value, unless executed using
+ * {@link #returnExecute(VirtualFrame)}.
  */
 @GenerateWrapper
 public abstract class StatementNode extends PNode {
     @CompilationFinal private boolean isTryBlock = false;
+    @CompilationFinal private boolean returnFallThrough;
 
     public abstract void executeVoid(VirtualFrame frame);
 
@@ -50,11 +54,16 @@ public abstract class StatementNode extends PNode {
      */
     public Object returnExecute(VirtualFrame frame) {
         executeVoid(frame);
+        if (!returnFallThrough) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            returnFallThrough = true;
+        }
         return PNone.NONE;
     }
 
     // Helper method
     protected final Object genericExecute(VirtualFrame frame, boolean isReturnExecute) {
+        CompilerAsserts.partialEvaluationConstant(isReturnExecute);
         if (isReturnExecute) {
             return returnExecute(frame);
         } else {