[GR-17191] Add iterator roll out to DestructuringAssignmentNode

PullRequest: graalpython/593

Author: Franziska Geiger

graalpython/com.oracle.graal.python.test/src/tests/test_for.py

@@ -112,3 +112,19 @@ def test_else_break_from_while():
             iters += 1
             break
     assert iters == 11, "if the while-loop doesn't break, the else should be executed and break out of the outer loop"
+
+class A(object):
+    def __iter__(self):
+        return iter(['key', 'value'])
+
+
+def test_for_iter():
+    a1 = A()
+    a2 = A()
+    list = [a1, a2]
+    iterator = 0
+    for key, value in list:
+        assert 'key' in key
+        assert 'value' in value
+        iterator += 1
+    assert iterator==2

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/DestructuringAssignmentNode.java

@@ -37,7 +37,9 @@
 import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
+import com.oracle.graal.python.nodes.builtins.ListNodes.CreateStorageFromIteratorNode;
 import com.oracle.graal.python.nodes.builtins.TupleNodes;
+import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.statement.StatementNode;
@@ -54,7 +56,7 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 
 public final class DestructuringAssignmentNode extends StatementNode implements WriteNode {
-    @Child private PythonObjectFactory factory;
+    @Child private PythonObjectFactory factory = PythonObjectFactory.create();
     @Child private PRaiseNode raiseNode;
     @CompilationFinal private ContextReference<PythonContext> contextRef;
 
@@ -68,6 +70,9 @@ public final class DestructuringAssignmentNode extends StatementNode implements
     @Child private LookupInheritedAttributeNode lookupGetItemNode = LookupInheritedAttributeNode.create(__GETITEM__);
     @Child private TupleNodes.ConstructTupleNode constructTupleNode = TupleNodes.ConstructTupleNode.create();
 
+    @Child private CreateStorageFromIteratorNode storageNode = CreateStorageFromIteratorNode.create();
+    @Child private GetIteratorNode getIteratorNode = GetIteratorNode.create();
+
     private final IsBuiltinClassProfile notEnoughValuesProfile = IsBuiltinClassProfile.create();
     private final IsBuiltinClassProfile tooManyValuesErrorProfile = IsBuiltinClassProfile.create();
     private final BranchProfile tooManyValuesProfile = BranchProfile.create();
@@ -120,10 +125,6 @@ private int fillFromArray(VirtualFrame frame, Object[] array, int startIndex) {
 
     private int fillStarred(VirtualFrame frame, Object rhsValue) {
         int pos = starredIndex;
-        if (factory == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            factory = insert(PythonObjectFactory.create());
-        }
         try {
             // TODO(ls): proper cast to int
             // TODO(ls): the result of the len call doesn't seem to be used in Python
@@ -175,7 +176,8 @@ public ExpressionNode getRhs() {
         return rhs;
     }
 
-    public void doWrite(VirtualFrame frame, Object rhsValue) {
+    public void doWrite(VirtualFrame frame, Object rhsVal) {
+        Object rhsValue = factory.createList(storageNode.execute(frame, getIteratorNode.executeWith(frame, rhsVal)));
         int nonExistingItem;
         try {
             if (starredIndex == -1) {