Fix test_custom_iterator_return

Author: steve-s

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

@@ -11,6 +11,7 @@ test.test_yield_from.TestPEP380Operation.test_broken_getattr_handling @ linux-x8
 test.test_yield_from.TestPEP380Operation.test_catching_exception_from_subgen_and_returning @ linux-x86_64
 test.test_yield_from.TestPEP380Operation.test_close_with_cleared_frame @ linux-x86_64
 test.test_yield_from.TestPEP380Operation.test_conversion_of_sendNone_to_next @ linux-x86_64
+test.test_yield_from.TestPEP380Operation.test_custom_iterator_return @ linux-x86_64
 test.test_yield_from.TestPEP380Operation.test_delegating_close @ linux-x86_64
 test.test_yield_from.TestPEP380Operation.test_delegating_generators_claim_to_be_running @ linux-x86_64
 test.test_yield_from.TestPEP380Operation.test_delegating_throw @ linux-x86_64

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

@@ -2638,7 +2638,7 @@ public void emitYieldFrom(Runnable generatorOrCoroutineProducer) {
              *
              * end:
              * # Step 4: return returnValue
-             * returnValue (result)
+             * load returnValue (result)
              * @formatter:on
              */
             b.beginBlock();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -108,6 +108,7 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.TpSlots;
 import com.oracle.graal.python.builtins.objects.type.TpSlots.GetObjectSlotsNode;
+import com.oracle.graal.python.builtins.objects.type.slots.TpSlotIterNext.CallSlotTpIterNextNode;
 import com.oracle.graal.python.builtins.objects.typing.PTypeAliasType;
 import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.compiler.OpCodes.MakeTypeParamKind;
@@ -3377,25 +3378,35 @@ static boolean doGenerator(VirtualFrame virtualFrame,
             }
         }
 
-        @Specialization(guards = "iterCheck.execute(inliningTarget, iter)", limit = "1")
+        static boolean hasIterSlot(TpSlots slots) {
+            return PyIterCheckNode.checkSlots(slots);
+        }
+
+        @Specialization(guards = "hasIterSlot(slots)", limit = "1")
         static boolean doIterator(VirtualFrame virtualFrame,
                         LocalAccessor yieldedValue,
                         LocalAccessor returnedValue,
                         Object iter,
                         @SuppressWarnings("unused") PNone arg,
                         @Bind Node inliningTarget,
                         @Bind BytecodeNode bytecode,
-                        @SuppressWarnings("unused") @Cached PyIterCheckNode iterCheck,
-                        @Cached PyIterNextNode getNextNode,
+                        @SuppressWarnings("unused") @Cached GetObjectSlotsNode getSlots,
+                        @Bind("getSlots.execute(inliningTarget, iter)") TpSlots slots,
+                        @Cached CallSlotTpIterNextNode callIterNext,
+                        @Exclusive @Cached InlinedBranchProfile exhaustedNoException,
                         @Shared @Cached IsBuiltinObjectProfile stopIterationProfile,
                         @Shared @Cached StopIterationBuiltins.StopIterationValueNode getValue) {
             try {
-                Object value = getNextNode.execute(virtualFrame, inliningTarget, iter);
+                Object value = callIterNext.execute(virtualFrame, inliningTarget, slots.tp_iternext(), iter);
                 yieldedValue.setObject(bytecode, virtualFrame, value);
                 return false;
             } catch (IteratorExhausted e) {
+                exhaustedNoException.enter(inliningTarget);
                 returnedValue.setObject(bytecode, virtualFrame, PNone.NONE);
                 return true;
+            } catch (PException e) {
+                handleException(virtualFrame, e, inliningTarget, bytecode, stopIterationProfile, getValue, returnedValue);
+                return true;
             }
         }