This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 87da590  Trivial refactoring: remove duplicated code
87da590 is described below

commit 87da590f38f5f824300b4eff9e794117b963f563
Author: Daniel Sun <[email protected]>
AuthorDate: Tue Feb 16 22:46:35 2021 +0800

    Trivial refactoring: remove duplicated code
---
 .../org/codehaus/groovy/classgen/asm/CallSiteWriter.java    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java 
b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
index be857db..1705594 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/CallSiteWriter.java
@@ -308,16 +308,7 @@ public class CallSiteWriter {
         int numberOfArguments = containsSpreadExpression ? -1 : 
AsmClassGenerator.argumentSize(arguments);
         int operandsToReplace = 1;
         if (numberOfArguments > MethodCallerMultiAdapter.MAX_ARGS || 
containsSpreadExpression) {
-            ArgumentListExpression ae;
-            if (arguments instanceof ArgumentListExpression) {
-                ae = (ArgumentListExpression) arguments;
-            } else if (arguments instanceof TupleExpression) {
-                TupleExpression te = (TupleExpression) arguments;
-                ae = new ArgumentListExpression(te.getExpressions());
-            } else {
-                ae = new ArgumentListExpression();
-                ae.addExpression(arguments);
-            }
+            ArgumentListExpression ae = 
InvocationWriter.makeArgumentList(arguments);
             controller.getCompileStack().pushImplicitThis(false);
             if (containsSpreadExpression) {
                 numberOfArguments = -1;
@@ -361,7 +352,7 @@ public class CallSiteWriter {
         }
         operandStack.replace(ClassHelper.OBJECT_TYPE,operandsToReplace);
     }
-    
+
     private static String getDescForParamNum(int numberOfArguments) {
         switch (numberOfArguments) {
             case 0:

Reply via email to