[GR-23234] Fix generator invocation

PullRequest: graalpython/1078

Author: msimacek

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

@@ -256,6 +256,36 @@ def f():
     #     self.assertTrue(isinstance(cm.exception.value, StopIteration))
     #     self.assertEqual(cm.exception.value.value, 2)
 
+    def test_generator_caller_frame(self):
+        def gen():
+            yield sys._getframe(1)
+            yield sys._getframe(1)
+
+        def callnext(g):
+            next(g)
+            return next(g)
+
+        def callsend(g):
+            next(g)
+            return g.send(1)
+
+        self.assertEqual(callnext(gen()).f_code.co_name, 'callnext')
+        self.assertEqual(callsend(gen()).f_code.co_name, 'callsend')
+
+        # Force a megamorphic call to the genrator function
+        def genfn(i):
+            l = {}
+            exec(f"def f{i}(): yield {i}", l)
+            return l[f'f{i}']
+
+        fns = [genfn(i) for i in range(100)]
+        fns.append(gen)
+        for fn in fns:
+            g = fn()
+        self.assertEqual(callnext(g).f_code.co_name, 'callnext')
+        for fn in fns:
+            g = fn()
+        self.assertEqual(callsend(g).f_code.co_name, 'callsend')
 
 if sys.version_info.minor == 4 and sys.version_info.micro < 3:
     del ExceptionTest

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

@@ -8,6 +8,7 @@
 *graalpython.lib-python.3.test.test_generators.ExceptionTest.test_tutorial_stopiteration
 *graalpython.lib-python.3.test.test_generators.FinalizationTest.test_lambda_generator
 *graalpython.lib-python.3.test.test_generators.GeneratorTest.test_copy
+*graalpython.lib-python.3.test.test_generators.GeneratorTest.test_name
 *graalpython.lib-python.3.test.test_generators.GeneratorTest.test_pickle
 *graalpython.lib-python.3.test.test_generators.SignalAndYieldFromTest.test_raise_and_yield_from
 *graalpython.lib-python.3.test.test_generators.YieldFromTests.test_generator_gi_yieldfrom

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -1476,28 +1476,31 @@ public abstract static class MinNode extends MinMaxNode {
     public abstract static class NextNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "isNoValue(defaultObject)")
         public Object next(VirtualFrame frame, Object iterator, PNone defaultObject,
-                        @Cached("create()") GetNextNode next,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile) {
-            try {
-                return next.execute(frame, iterator);
-            } catch (PException e) {
-                e.expectAttributeError(errorProfile);
-                throw raise(TypeError, e.setCatchingFrameAndGetEscapedException(frame), ErrorMessages.OBJ_ISNT_ITERATOR, iterator);
-            }
+                        @Cached("createNextCall()") LookupAndCallUnaryNode callNode) {
+            return callNode.executeObject(frame, iterator);
         }
 
         @Specialization(guards = "!isNoValue(defaultObject)")
         public Object next(VirtualFrame frame, Object iterator, Object defaultObject,
-                        @Cached("create()") NextNode next,
+                        @Cached("createNextCall()") LookupAndCallUnaryNode callNode,
                         @Cached("create()") IsBuiltinClassProfile errorProfile) {
             try {
-                return next.execute(frame, iterator, PNone.NO_VALUE);
+                return callNode.executeObject(frame, iterator);
             } catch (PException e) {
                 e.expectStopIteration(errorProfile);
                 return defaultObject;
             }
         }
 
+        protected LookupAndCallUnaryNode createNextCall() {
+            return LookupAndCallUnaryNode.create(__NEXT__, () -> new LookupAndCallUnaryNode.NoAttributeHandler() {
+                @Override
+                public Object execute(Object iterator) {
+                    throw raise(TypeError, ErrorMessages.OBJ_ISNT_ITERATOR, iterator);
+                }
+            });
+        }
+
         protected static NextNode create() {
             return BuiltinFunctionsFactory.NextNodeFactory.create();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectAlloc.java

@@ -44,7 +44,6 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
-import com.oracle.graal.python.nodes.call.CallTargetInvokeNode;
 import com.oracle.graal.python.nodes.call.GenericInvokeNode;
 import com.oracle.graal.python.nodes.frame.GetCurrentFrameRef;
 import com.oracle.graal.python.nodes.util.CannotCastException;
@@ -125,11 +124,6 @@ Object execute(Object[] arguments,
         return -2;
     }
 
-    static CallTargetInvokeNode createInvokeNode(ContextReference<PythonContext> contextRef) {
-        CApiContext cApiContext = contextRef.get().getCApiContext();
-        return CallTargetInvokeNode.create(cApiContext.getTriggerAsyncActionsCallTarget(), false, false);
-    }
-
     static AllocationReporter getAllocationReporter(ContextReference<PythonContext> contextRef) {
         return contextRef.get().getEnv().lookup(AllocationReporter.class);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PArguments.java

@@ -325,6 +325,18 @@ public static void setGeneratorFrame(Object[] arguments, MaterializedFrame gener
         arguments[INDEX_GENERATOR_FRAME] = generatorFrame;
     }
 
+    /**
+     * This should be used only in GeneratorFunctionRootNode, later the slot is overwritten with
+     * generator frame
+     */
+    public static PFunction getGeneratorFunction(Object[] arguments) {
+        return (PFunction) arguments[INDEX_GENERATOR_FRAME];
+    }
+
+    public static void setGeneratorFunction(Object[] arguments, PFunction generatorFunction) {
+        arguments[INDEX_GENERATOR_FRAME] = generatorFunction;
+    }
+
     public static void setControlData(Object[] arguments, GeneratorControlData generatorArguments) {
         MaterializedFrame generatorFrame = (MaterializedFrame) arguments[INDEX_GENERATOR_FRAME];
         generatorFrame.getArguments()[INDEX_GENERATOR_FRAME] = generatorArguments;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -128,11 +128,7 @@ public PCell[] getClosure() {
     }
 
     public boolean isGeneratorFunction() {
-        return false;
-    }
-
-    public PGeneratorFunction asGeneratorFunction() {
-        return null;
+        return code.getRootCallTarget().getRootNode() instanceof GeneratorFunctionRootNode;
     }
 
     @Override