with a constant CallTarget, the arity is also constant

Author: timfel

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

@@ -79,7 +79,7 @@ protected Object callMethod(VirtualFrame frame, PMethod method, Object[] argumen
     protected Object callMethod(VirtualFrame frame, PMethod method, Object[] arguments, PKeyword[] keywords,
                     @Cached("method.getFunction().getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(method)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, method.getGlobals(), method.getClosure(), method.getArity(), arguments, keywords);
+        return invoke.execute(frame, method.getGlobals(), method.getClosure(), arguments, keywords);
     }
 
     @SuppressWarnings("unused")
@@ -95,7 +95,7 @@ protected Object callBuiltinMethod(VirtualFrame frame, PBuiltinMethod method, Ob
     protected Object callBuiltinMethod(VirtualFrame frame, PBuiltinMethod method, Object[] arguments, PKeyword[] keywords,
                     @Cached("method.getFunction().getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(method)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, method.getGlobals(), method.getClosure(), method.getArity(), arguments, keywords);
+        return invoke.execute(frame, method.getGlobals(), method.getClosure(), arguments, keywords);
     }
 
     @SuppressWarnings("unused")
@@ -111,15 +111,15 @@ protected Object callFunction(VirtualFrame frame, PythonCallable callee, Object[
     protected Object callFunction(VirtualFrame frame, PFunction callee, Object[] arguments, PKeyword[] keywords,
                     @Cached("callee.getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(callee)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, callee.getGlobals(), callee.getClosure(), callee.getArity(), arguments, keywords);
+        return invoke.execute(frame, callee.getGlobals(), callee.getClosure(), arguments, keywords);
     }
 
     @SuppressWarnings("unused")
     @Specialization(guards = "callee.getCallTarget() == ct", limit = "getCallSiteInlineCacheMaxDepth()")
     protected Object callFunction(VirtualFrame frame, PBuiltinFunction callee, Object[] arguments, PKeyword[] keywords,
                     @Cached("callee.getCallTarget()") RootCallTarget ct,
                     @Cached("createCtInvokeNode(callee)") CallTargetInvokeNode invoke) {
-        return invoke.execute(frame, callee.getGlobals(), callee.getClosure(), callee.getArity(), arguments, keywords);
+        return invoke.execute(frame, callee.getGlobals(), callee.getClosure(), arguments, keywords);
     }
 
     @Specialization(replaces = {"callMethod", "callBuiltinMethod", "callFunction"})

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

@@ -150,10 +150,12 @@ protected Object execute(VirtualFrame frame, PythonCallable callee, Object[] arg
 abstract class CallTargetInvokeNode extends AbstractInvokeNode {
     @Child private DirectCallNode callNode;
     @Child private ArityCheckNode arityCheck = ArityCheckNode.create();
+    private final Arity arity;
     protected final boolean isBuiltin;
 
-    protected CallTargetInvokeNode(CallTarget callTarget, boolean isBuiltin, boolean isGenerator) {
+    protected CallTargetInvokeNode(CallTarget callTarget, Arity arity, boolean isBuiltin, boolean isGenerator) {
         this.callNode = Truffle.getRuntime().createDirectCallNode(callTarget);
+        this.arity = arity;
         if (isBuiltin) {
             callNode.cloneCallTarget();
         }
@@ -167,13 +169,13 @@ protected CallTargetInvokeNode(CallTarget callTarget, boolean isBuiltin, boolean
     public static CallTargetInvokeNode create(PythonCallable callee) {
         RootCallTarget callTarget = getCallTarget(callee);
         boolean builtin = isBuiltin(callee);
-        return CallTargetInvokeNodeGen.create(callTarget, builtin, callee.isGeneratorFunction());
+        return CallTargetInvokeNodeGen.create(callTarget, callee.getArity(), builtin, callee.isGeneratorFunction());
     }
 
-    public abstract Object execute(VirtualFrame frame, PythonObject globals, PCell[] closure, Arity arity, Object[] arguments, PKeyword[] keywords);
+    public abstract Object execute(VirtualFrame frame, PythonObject globals, PCell[] closure, Object[] arguments, PKeyword[] keywords);
 
     @Specialization(guards = {"keywords.length == 0"})
-    protected Object doNoKeywords(VirtualFrame frame, PythonObject globals, PCell[] closure, Arity arity, Object[] arguments, PKeyword[] keywords) {
+    protected Object doNoKeywords(VirtualFrame frame, PythonObject globals, PCell[] closure, Object[] arguments, PKeyword[] keywords) {
         PArguments.setGlobals(arguments, globals);
         PArguments.setClosure(arguments, closure);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));
@@ -182,7 +184,7 @@ protected Object doNoKeywords(VirtualFrame frame, PythonObject globals, PCell[]
     }
 
     @Specialization(guards = {"!isBuiltin"})
-    protected Object doWithKeywords(VirtualFrame frame, PythonObject globals, PCell[] closure, Arity arity, Object[] arguments, PKeyword[] keywords,
+    protected Object doWithKeywords(VirtualFrame frame, PythonObject globals, PCell[] closure, Object[] arguments, PKeyword[] keywords,
                     @Cached("create()") ApplyKeywordsNode applyKeywords) {
         Object[] combined = applyKeywords.execute(arity, arguments, keywords);
         PArguments.setGlobals(combined, globals);
@@ -193,7 +195,7 @@ protected Object doWithKeywords(VirtualFrame frame, PythonObject globals, PCell[
     }
 
     @Specialization(guards = "isBuiltin")
-    protected Object doBuiltinWithKeywords(VirtualFrame frame, @SuppressWarnings("unused") PythonObject globals, @SuppressWarnings("unused") PCell[] closure, Arity arity, Object[] arguments,
+    protected Object doBuiltinWithKeywords(VirtualFrame frame, @SuppressWarnings("unused") PythonObject globals, @SuppressWarnings("unused") PCell[] closure, Object[] arguments,
                     PKeyword[] keywords) {
         PArguments.setKeywordArguments(arguments, keywords);
         PArguments.setCallerFrame(arguments, getCallerFrame(frame, callNode.getCallTarget()));