avoid inlining of java library code

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ApplyKeywordsNode.java

@@ -40,8 +40,6 @@
  */
 package com.oracle.graal.python.nodes.argument;
 
-import java.util.ArrayList;
-
 import com.oracle.graal.python.builtins.objects.function.Arity;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -65,7 +63,8 @@ private static Object[] applyKeywordArgs(Arity calleeArity, Object[] arguments,
             combined = PArguments.create(parameters.length);
             System.arraycopy(arguments, 0, combined, 0, arguments.length);
         }
-        ArrayList<PKeyword> unusedKeywords = new ArrayList<>();
+        PKeyword[] unusedKeywords = new PKeyword[keywords.length];
+        int unusedKeywordsIdx = 0;
         for (int i = 0; i < keywords.length; i++) {
             PKeyword keyarg = keywords[i];
             int keywordIdx = -1;
@@ -80,10 +79,13 @@ private static Object[] applyKeywordArgs(Arity calleeArity, Object[] arguments,
                 assert PArguments.getArgument(combined, keywordIdx) == null : calleeArity.getFunctionName() + " got multiple values for argument '" + keyarg.getName() + "'";
                 PArguments.setArgument(combined, keywordIdx, keyarg.getValue());
             } else {
-                unusedKeywords.add(keyarg);
+                unusedKeywords[unusedKeywordsIdx] = keyarg;
+                unusedKeywordsIdx++;
             }
         }
-        PArguments.setKeywordArguments(combined, unusedKeywords.toArray(new PKeyword[unusedKeywords.size()]));
+        PKeyword[] keywordArguments = new PKeyword[unusedKeywordsIdx];
+        System.arraycopy(unusedKeywords, 0, keywordArguments, 0, unusedKeywordsIdx);
+        PArguments.setKeywordArguments(combined, keywordArguments);
         return combined;
     }
 
@@ -112,18 +114,22 @@ Object[] applyCached(Arity calleeArity, Object[] arguments, PKeyword[] keywords,
                 combined[i] = arguments[i];
             }
         }
-        ArrayList<PKeyword> unusedKeywords = new ArrayList<>();
+        PKeyword[] unusedKeywords = new PKeyword[kwLen];
+        int unusedKeywordsIdx = 0;
         for (int i = 0; i < kwLen; i++) {
             PKeyword keyarg = keywords[i];
             int keywordIdx = searchParamNode.execute(parameters, keyarg.getName());
             if (keywordIdx != -1) {
                 assert PArguments.getArgument(combined, keywordIdx) == null : calleeArity.getFunctionName() + " got multiple values for argument '" + keyarg.getName() + "'";
                 PArguments.setArgument(combined, keywordIdx, keyarg.getValue());
             } else {
-                unusedKeywords.add(keyarg);
+                unusedKeywords[unusedKeywordsIdx] = keyarg;
+                unusedKeywordsIdx++;
             }
         }
-        PArguments.setKeywordArguments(combined, unusedKeywords.toArray(new PKeyword[unusedKeywords.size()]));
+        PKeyword[] keywordArguments = new PKeyword[unusedKeywordsIdx];
+        System.arraycopy(unusedKeywords, 0, keywordArguments, 0, unusedKeywordsIdx);
+        PArguments.setKeywordArguments(combined, keywordArguments);
         return combined;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ArityCheckNode.java

@@ -114,8 +114,7 @@ private void arityCheck(Arity arity, int numOfArgs, int numOfKeywordsDeclared, i
         if (numOfKeywordsGiven == 0) {
             arityCheck(arity, numOfArgs);
         } else if (!arity.takesKeywordArg() && numOfKeywordsGiven > 0) {
-            Object[] args = {};
-            throw raise(TypeError, arity.getFunctionName() + "() takes no keyword arguments", args);
+            throw raise(TypeError, "%s() takes no keyword arguments", arity.getFunctionName());
         } else {
             for (int i = 0; i < numOfKeywordsGiven; i++) {
                 String keyword = keywords[i];
@@ -136,37 +135,24 @@ private void checkKeyword(Arity arity, String keyword, int length) {
                 return;
             }
         }
-        Object[] args = {arity.getFunctionName(), keyword};
-        throw raise(TypeError, "%s() got an unexpected keyword argument '%s'", args);
+        throw raise(TypeError, "%s() got an unexpected keyword argument '%s'", arity.getFunctionName(), keyword);
     }
 
     private void arityCheck(Arity arity, int numOfArgs) {
-        String argMessage;
         if (!arity.takesVarArgs() && arity.getMinNumOfArgs() == arity.getMaxNumOfArgs()) {
             if (numOfArgs != arity.getMinNumOfArgs()) {
                 if (arity.getMinNumOfArgs() == 0) {
-                    argMessage = "no arguments";
+                    throw raise(TypeError, "%s() takes no arguments (%d given)", arity.getFunctionName(), numOfArgs);
                 } else if (arity.getMinNumOfArgs() == 1) {
-                    argMessage = "exactly one argument";
+                    throw raise(TypeError, "%s() takes exactly one argument (%d given)", arity.getFunctionName(), numOfArgs);
                 } else {
-                    argMessage = arity.getMinNumOfArgs() + " arguments";
+                    throw raise(TypeError, "%s() takes %d arguments (%d given)", arity.getFunctionName(), arity.getMinNumOfArgs(), numOfArgs);
                 }
-                Object[] args = {arity.getFunctionName(), argMessage, numOfArgs};
-                throw raise(TypeError, "%s() takes %s (%d given)", args);
             }
         } else if (numOfArgs < arity.getMinNumOfArgs()) {
-            /**
-             * For ex, iter(object[, sentinel]) takes at least 1 argument.
-             */
-            Object[] args = {arity.getFunctionName(), arity.getMinNumOfArgs(), numOfArgs};
-            throw raise(TypeError, "%s() expected at least %d arguments (%d) given", args);
+            throw raise(TypeError, "%s() expected at least %d arguments (%d) given", arity.getFunctionName(), arity.getMinNumOfArgs(), numOfArgs);
         } else if (!arity.takesVarArgs() && numOfArgs > arity.getMaxNumOfArgs()) {
-            /**
-             * For ex, complex([real[, imag]]) takes at most 2 arguments.
-             */
-            argMessage = "at most " + arity.getMaxNumOfArgs() + " arguments";
-            Object[] args = {arity.getFunctionName(), argMessage, numOfArgs};
-            throw raise(TypeError, "%s() takes %s (%d given)", args);
+            throw raise(TypeError, "%s() takes at most %d arguments (%d given)", arity.getFunctionName(), arity.getMaxNumOfArgs(), numOfArgs);
         }
     }
 }