Revert "speculate that a loop is always executed at least once"

This reverts commit 2972f2ffb5225c604ae4ce500db24554aeb59ef3.

Author: timfel

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

@@ -39,6 +39,7 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.Truffle;
@@ -48,15 +49,14 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
-import com.oracle.truffle.api.frame.FrameUtil;
+import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.nodes.RepeatingNode;
 
 final class ForRepeatingNode extends PNodeWithContext implements RepeatingNode {
-    @CompilationFinal FrameSlot firstIterationSlot;
+
     @CompilationFinal FrameSlot iteratorSlot;
-    @CompilationFinal boolean loopNeverSkipped = true;
     private final ContextReference<PythonContext> contextRef = PythonLanguage.getContextRef();
     @Child ForNextElementNode nextElement;
     @Child StatementNode body;
@@ -68,30 +68,16 @@ public ForRepeatingNode(StatementNode target, StatementNode body) {
     }
 
     public boolean executeRepeating(VirtualFrame frame) {
-        Object iteratorObject = FrameUtil.getObjectSafe(frame, iteratorSlot);
-        if (loopNeverSkipped) {
-            boolean firstIteration = FrameUtil.getBooleanSafe(frame, firstIterationSlot);
-            if (firstIteration) {
-                // first loop iteration, write the iterator
-                if (!nextElement.execute(frame, iteratorObject)) {
-                    // if we ever skip the loop we invalidate here. this helps the
-                    // compiler understand if a loop is never skipped, that the loop
-                    // variable can never be null after the loop, so it doesn't have
-                    // to merge the last value of the loop variable with null
-                    CompilerDirectives.transferToInterpreterAndInvalidate();
-                    loopNeverSkipped = false;
-                    return false;
-                }
-                frame.setBoolean(firstIterationSlot, false);
-            } else {
-                if (!nextElement.execute(frame, iteratorObject)) {
-                    return false;
-                }
-            }
-        } else {
-            if (!nextElement.execute(frame, iteratorObject)) {
+        try {
+            if (!nextElement.execute(frame, frame.getObject(iteratorSlot))) {
                 return false;
             }
+        } catch (FrameSlotTypeException e) {
+            if (raise == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                raise = insert(PRaiseNode.create());
+            }
+            throw raise.raise(PythonErrorType.RuntimeError, "internal error: unexpected frame slot type");
         }
         body.executeVoid(frame);
         contextRef.get().triggerAsyncActions(frame, this);
@@ -101,6 +87,7 @@ public boolean executeRepeating(VirtualFrame frame) {
 
 @ImportStatic({PythonOptions.class, SpecialMethodNames.class})
 abstract class ForNextElementNode extends PNodeWithContext {
+
     @Child StatementNode target;
 
     public ForNextElementNode(StatementNode target) {
@@ -165,10 +152,11 @@ protected boolean doIterator(VirtualFrame frame, Object object,
 
 @NodeInfo(shortName = "for")
 public final class ForNode extends LoopNode {
+
     @CompilationFinal private FrameSlot iteratorSlot;
-    @CompilationFinal private FrameSlot firstIterationSlot;
-    @Child private ExpressionNode iterator;
+
     @Child private com.oracle.truffle.api.nodes.LoopNode loopNode;
+    @Child private ExpressionNode iterator;
 
     public ForNode(StatementNode body, StatementNode target, ExpressionNode iterator) {
         this.iterator = iterator;
@@ -179,25 +167,22 @@ public StatementNode getTarget() {
         return ((ForRepeatingNode) loopNode.getRepeatingNode()).nextElement.target;
     }
 
+    public ExpressionNode getIterator() {
+        return iterator;
+    }
+
     @Override
     public StatementNode getBody() {
         return ((ForRepeatingNode) loopNode.getRepeatingNode()).body;
     }
 
-    public ExpressionNode getIterator() {
-        return iterator;
-    }
-
     @Override
     public void executeVoid(VirtualFrame frame) {
         if (iteratorSlot == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             iteratorSlot = frame.getFrameDescriptor().addFrameSlot(new Object(), FrameSlotKind.Object);
             ((ForRepeatingNode) loopNode.getRepeatingNode()).iteratorSlot = iteratorSlot;
-            firstIterationSlot = frame.getFrameDescriptor().addFrameSlot(new Object(), FrameSlotKind.Boolean);
-            ((ForRepeatingNode) loopNode.getRepeatingNode()).firstIterationSlot = firstIterationSlot;
         }
-        frame.setBoolean(firstIterationSlot, true);
         frame.setObject(iteratorSlot, iterator.execute(frame));
         try {
             loopNode.executeLoop(frame);