Fix test_generator_gi_yieldfrom

Author: steve-s

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

@@ -476,4 +476,34 @@ def generator():
     assert type(g.send(None)) == NotImplementedError # 13
     assert type(g.send(None)) == NameError # 14
     assert g.send(None) is None # 15
-    assert g.send(None) is None # 16
+    assert g.send(None) is None # 16
+
+
+def test_generator_gi_yieldfrom_multiple():
+    # the same test as in CPython test suite, but with multiple yield from
+    def a():
+        yield
+
+    def q():
+        yield
+
+    def b():
+        yield from a()
+        yield
+        yield from q()
+        yield
+
+    gen_b = b()
+    assert gen_b.gi_yieldfrom is None
+
+    gen_b.send(None)
+    assert gen_b.gi_yieldfrom.gi_code.co_name == 'a'
+
+    gen_b.send(None)
+    assert gen_b.gi_yieldfrom is None
+
+    gen_b.send(None)
+    assert gen_b.gi_yieldfrom.gi_code.co_name == 'q'
+
+    gen_b.send(None)
+    assert gen_b.gi_yieldfrom is None

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags_bytecode_dsl/test_generators.txt

@@ -34,3 +34,5 @@ test.test_generators.GeneratorThrowTest.test_exception_context_with_yield_from @
 test.test_generators.GeneratorThrowTest.test_exception_context_with_yield_from_with_context_cycle @ linux-x86_64
 test.test_generators.GeneratorThrowTest.test_exception_context_with_yield_inside_generator @ linux-x86_64
 test.test_generators.GeneratorThrowTest.test_throw_after_none_exc_type @ linux-x86_64
+test.test_generators.YieldFromTests.test_generator_gi_yieldfrom @ linux-x86_64
+

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -2731,10 +2731,10 @@ public void emitYieldFrom(Runnable generatorOrCoroutineProducer, BytecodeLocal r
             if (!savedYieldFromGenerator) {
                 savedYieldFromGenerator = true;
                 yieldFromGenerator = b.createLocal();
-                b.beginStoreLocal(yieldFromGenerator);
-                b.emitLoadLocal(generator);
-                b.endStoreLocal();
             }
+            b.beginStoreLocal(yieldFromGenerator);
+            b.emitLoadLocal(generator);
+            b.endStoreLocal();
 
             b.beginStoreLocal(returnValue);
             b.emitLoadConstant(PNone.NONE);
@@ -2786,6 +2786,9 @@ public void emitYieldFrom(Runnable generatorOrCoroutineProducer, BytecodeLocal r
 
             // Step 4: the returnValue local is assigned when branching to "end" label
             b.emitLabel(end);
+            b.beginStoreLocal(yieldFromGenerator);
+            b.emitLoadNull();
+            b.endStoreLocal();
             b.endBlock();
         }