Pass callee to CallTargetInvokeNode

Author: msimacek

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(), null, 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/generator/GeneratorBuiltins.java

@@ -153,7 +153,7 @@ static Object cached(VirtualFrame frame, PGenerator self, Object sendValue,
                 PArguments.setSpecialArgument(arguments, sendValue);
             }
             try {
-                return call.execute(frame, null, null, arguments);
+                return call.execute(frame, null, null, null, arguments);
             } catch (PException e) {
                 self.markAsFinished();
                 throw e;
@@ -183,7 +183,7 @@ static Object generic(VirtualFrame frame, PGenerator self, Object sendValue,
         }
 
         protected static CallTargetInvokeNode createDirectCall(CallTarget target) {
-            return CallTargetInvokeNode.create(target, null, false, true);
+            return CallTargetInvokeNode.create(target, false, true);
         }
 
         protected static boolean sameCallTarget(RootCallTarget target1, CallTarget target2) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallDispatchNode.java

@@ -115,7 +115,7 @@ protected Object callFunctionCachedCode(VirtualFrame frame, @SuppressWarnings("u
     protected Object callFunctionCachedCt(VirtualFrame frame, PFunction callee, Object[] arguments,
                     @SuppressWarnings("unused") @Cached("callee.getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(callee)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, callee.getGlobals(), callee.getClosure(), arguments);
+        return invoke.execute(frame, callee, callee.getGlobals(), callee.getClosure(), arguments);
     }
 
     @Specialization(guards = {"callee == cachedCallee"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
@@ -129,7 +129,7 @@ protected Object callBuiltinFunctionCached(VirtualFrame frame, @SuppressWarnings
     protected Object callBuiltinFunctionCachedCt(VirtualFrame frame, @SuppressWarnings("unused") PBuiltinFunction callee, Object[] arguments,
                     @SuppressWarnings("unused") @Cached("callee.getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(callee)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, null, null, arguments);
+        return invoke.execute(frame, null, null, null, arguments);
     }
 
     @Specialization(replaces = {"callFunctionCached", "callFunctionCachedCode", "callFunctionCachedCt"})

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallTargetInvokeNode.java

@@ -65,20 +65,16 @@
 public abstract class CallTargetInvokeNode extends DirectInvokeNode {
     @Child private DirectCallNode callNode;
     @Child private CallContext callContext;
-    // Needed only for generator functions, will be null for builtins and other callables that
-    // cannot be generator functions
-    private final PFunction callee;
     protected final boolean isBuiltin;
 
-    protected CallTargetInvokeNode(CallTarget callTarget, PFunction callee, boolean isBuiltin, boolean isGenerator) {
+    protected CallTargetInvokeNode(CallTarget callTarget, boolean isBuiltin, boolean isGenerator) {
         this.callNode = Truffle.getRuntime().createDirectCallNode(callTarget);
         if (isBuiltin) {
             callNode.cloneCallTarget();
         }
         if (isGenerator && shouldInlineGenerators()) {
             this.callNode.forceInlining();
         }
-        this.callee = callee;
         this.callContext = CallContext.create();
         this.isBuiltin = isBuiltin;
     }
@@ -87,28 +83,28 @@ protected CallTargetInvokeNode(CallTarget callTarget, PFunction callee, boolean
     public static CallTargetInvokeNode create(PFunction callee) {
         RootCallTarget callTarget = getCallTarget(callee);
         boolean builtin = isBuiltin(callee);
-        return CallTargetInvokeNodeGen.create(callTarget, callee, builtin, callee.isGeneratorFunction());
+        return CallTargetInvokeNodeGen.create(callTarget, builtin, callee.isGeneratorFunction());
     }
 
     @TruffleBoundary
     public static CallTargetInvokeNode create(PBuiltinFunction callee) {
         RootCallTarget callTarget = getCallTarget(callee);
         boolean builtin = isBuiltin(callee);
-        return CallTargetInvokeNodeGen.create(callTarget, null, builtin, false);
+        return CallTargetInvokeNodeGen.create(callTarget, builtin, false);
     }
 
-    public static CallTargetInvokeNode create(CallTarget callTarget, PFunction callee, boolean isBuiltin, boolean isGenerator) {
-        return CallTargetInvokeNodeGen.create(callTarget, callee, isBuiltin, isGenerator);
+    public static CallTargetInvokeNode create(CallTarget callTarget, boolean isBuiltin, boolean isGenerator) {
+        return CallTargetInvokeNodeGen.create(callTarget, isBuiltin, isGenerator);
     }
 
-    public final Object execute(VirtualFrame frame, Object[] arguments) {
-        return execute(frame, null, null, arguments);
-    }
-
-    public abstract Object execute(VirtualFrame frame, PythonObject globals, PCell[] closure, Object[] arguments);
+    /**
+     * @param callee A PFunction if the callee is one, otherwise null. Used for generator functions
+     *            only.
+     */
+    public abstract Object execute(VirtualFrame frame, PFunction callee, PythonObject globals, PCell[] closure, Object[] arguments);
 
     @Specialization(guards = {"globals == null", "closure == null"})
-    protected Object doNoClosure(VirtualFrame frame, @SuppressWarnings("unused") PythonObject globals, @SuppressWarnings("unused") PCell[] closure, Object[] arguments,
+    protected Object doNoClosure(VirtualFrame frame, PFunction callee, @SuppressWarnings("unused") PythonObject globals, @SuppressWarnings("unused") PCell[] closure, Object[] arguments,
                     @Cached("createBinaryProfile()") ConditionProfile classBodyProfile,
                     @Cached("createBinaryProfile()") ConditionProfile generatorFunctionProfile,
                     @CachedContext(PythonLanguage.class) PythonContext context) {
@@ -134,13 +130,13 @@ protected Object doNoClosure(VirtualFrame frame, @SuppressWarnings("unused") Pyt
     }
 
     @Specialization(replaces = "doNoClosure")
-    protected Object doGeneric(VirtualFrame frame, PythonObject globals, PCell[] closure, Object[] arguments,
+    protected Object doGeneric(VirtualFrame frame, PFunction callee, PythonObject globals, PCell[] closure, Object[] arguments,
                     @Cached("createBinaryProfile()") ConditionProfile classBodyProfile,
                     @Cached("createBinaryProfile()") ConditionProfile generatorFunctionProfile,
                     @CachedContext(PythonLanguage.class) PythonContext context) {
         PArguments.setGlobals(arguments, globals);
         PArguments.setClosure(arguments, closure);
-        return doNoClosure(frame, null, null, arguments, classBodyProfile, generatorFunctionProfile, context);
+        return doNoClosure(frame, callee, null, null, arguments, classBodyProfile, generatorFunctionProfile, context);
     }
 
     public final CallTarget getCallTarget() {