src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java
changeset 48861 47f19ff9903c
parent 47216 71c04702a3d5
child 50858 2d3e99a72541
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java	Fri Feb 02 10:37:48 2018 -0500
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/AbstractBeginNode.java	Fri Feb 02 17:28:17 2018 -0800
@@ -129,10 +129,13 @@
             if (ret == null) {
                 throw new NoSuchElementException();
             }
-            if (!(current instanceof FixedWithNextNode) || (current instanceof AbstractBeginNode && current != AbstractBeginNode.this)) {
+            if (current instanceof FixedWithNextNode) {
+                current = ((FixedWithNextNode) current).next();
+                if (current instanceof AbstractBeginNode) {
+                    current = null;
+                }
+            } else {
                 current = null;
-            } else {
-                current = ((FixedWithNextNode) current).next();
             }
             return ret;
         }