Move CreateAndCheckArgumentsNode up

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextCEvalBuiltins.java

@@ -157,7 +157,7 @@ static Object doGeneric(PCode code, Object globals, Object locals,
                         @Cached SequenceNodes.GetObjectArrayNode getObjectArrayNode,
                         @Cached CodeNodes.GetCodeSignatureNode getSignatureNode,
                         @Cached CodeNodes.GetCodeCallTargetNode getCallTargetNode,
-                        @Cached CreateArgumentsNode.CreateAndCheckArgumentsNode createAndCheckArgumentsNode,
+                        @Cached CreateArgumentsNode createArgumentsNode,
                         @Cached CallDispatchers.SimpleIndirectInvokeNode invoke) {
             Object[] defaults = readNode.readPyObjectArray(defaultValueArrayPtr, defaultValueCount);
             PKeyword[] kwdefaults = castKwargsNode.execute(inliningTarget, kwdefaultsWrapper);
@@ -177,7 +177,7 @@ static Object doGeneric(PCode code, Object globals, Object locals,
             // prepare Python frame arguments
             Object[] userArguments = readNode.readPyObjectArray(argumentArrayPtr, argumentCount);
             Signature signature = getSignatureNode.execute(inliningTarget, code);
-            Object[] pArguments = createAndCheckArgumentsNode.execute(inliningTarget, code, userArguments, keywords, signature, null, null, defaults, kwdefaults, false);
+            Object[] pArguments = createArgumentsNode.execute(inliningTarget, code, userArguments, keywords, signature, null, null, defaults, kwdefaults, false);
 
             // set custom locals
             if (!(locals instanceof PNone)) {

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

@@ -52,7 +52,7 @@
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.function.Signature;
-import com.oracle.graal.python.nodes.argument.CreateArgumentsNode.CreateAndCheckArgumentsNode;
+import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
 import com.oracle.graal.python.nodes.argument.keywords.ExpandKeywordStarargsNode;
 import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
@@ -201,7 +201,7 @@ static final class PyCFunctionUnaryWrapper extends PyCFunctionWrapper {
         Object execute(Object[] arguments,
                         @Bind("$node") Node inliningTarget,
                         @Cached PythonToNativeNewRefNode toNativeNode,
-                        @Cached CreateAndCheckArgumentsNode createArgsNode,
+                        @Cached CreateArgumentsNode createArgsNode,
                         @Cached CallDispatchers.CallTargetCachedInvokeNode invokeNode,
                         @Cached NativeToPythonNode toJavaNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
@@ -259,7 +259,7 @@ Object execute(Object[] arguments,
                         @Bind("$node") Node inliningTarget,
                         @Cached PythonToNativeNewRefNode toNativeNode,
                         @Cached CallDispatchers.CallTargetCachedInvokeNode invokeNode,
-                        @Cached CreateAndCheckArgumentsNode createArgsNode,
+                        @Cached CreateArgumentsNode createArgsNode,
                         @Cached NativeToPythonNode toJavaNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
                         @Exclusive @Cached GilNode gil) throws ArityException {
@@ -327,7 +327,7 @@ Object execute(Object[] arguments,
                         @Bind("$node") Node inliningTarget,
                         @Cached PythonToNativeNewRefNode toNativeNode,
                         @Cached ExecutePositionalStarargsNode posStarargsNode,
-                        @Cached CreateAndCheckArgumentsNode createArgsNode,
+                        @Cached CreateArgumentsNode createArgsNode,
                         @Cached CallDispatchers.CallTargetCachedInvokeNode invokeNode,
                         @Cached NativeToPythonNode toJavaNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
@@ -390,7 +390,7 @@ Object execute(Object[] arguments,
                         @Bind("$node") Node inliningTarget,
                         @Cached PythonToNativeNewRefNode toNativeNode,
                         @Cached ExecutePositionalStarargsNode posStarargsNode,
-                        @Cached CreateAndCheckArgumentsNode createArgsNode,
+                        @Cached CreateArgumentsNode createArgsNode,
                         @Cached CallDispatchers.CallTargetCachedInvokeNode invokeNode,
                         @Cached ExpandKeywordStarargsNode expandKwargsNode,
                         @Cached NativeToPythonNode toJavaNode,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotVarargs.java

@@ -78,7 +78,7 @@
 import com.oracle.graal.python.builtins.objects.type.slots.TpSlotDescrGet.CallSlotDescrGet;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.argument.CreateArgumentsNode.CreateAndCheckArgumentsNode;
+import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
 import com.oracle.graal.python.nodes.call.BoundDescriptor;
 import com.oracle.graal.python.nodes.call.CallDispatchers;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -244,7 +244,7 @@ static Object callCachedBuiltin(VirtualFrame frame, Node inliningTarget, @Suppre
         @Specialization(replaces = "callCachedBuiltin")
         @InliningCutoff
         static Object callGenericBuiltin(VirtualFrame frame, Node inliningTarget, TpSlotVarargsBuiltin<?> slot, Object self, Object[] args, PKeyword[] keywords,
-                        @Cached CreateAndCheckArgumentsNode createArgumentsNode,
+                        @Cached CreateArgumentsNode createArgumentsNode,
                         @Cached CallDispatchers.SimpleIndirectInvokeNode invoke) {
             Object[] arguments = createArgumentsNode.execute(inliningTarget, slot.getName(), args, keywords, slot.getSignature(), self, null, slot.getDefaults(), slot.getKwDefaults(),
                             false);
@@ -261,7 +261,7 @@ abstract static class DispatchVarargsBuiltinFullDirectNode extends Node {
 
         @Specialization
         static Object call(VirtualFrame frame, Node inliningTarget, TpSlotVarargsBuiltin<?> slot, Object self, Object[] args, PKeyword[] keywords,
-                        @Cached CreateAndCheckArgumentsNode createArgumentsNode,
+                        @Cached CreateArgumentsNode createArgumentsNode,
                         @Cached("createDirectCallNode(slot)") DirectCallNode callNode,
                         @Cached CallDispatchers.SimpleDirectInvokeNode invoke) {
             CompilerAsserts.partialEvaluationConstant(slot);