Draft fix for varargs in jdt

niloc132 · Jun 19, 2024 · 54cf49b · 54cf49b
1 parent 33b0dd2
commit 54cf49b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
@@ -3256,13 +3256,13 @@ private List<JExpression> popCallArguments(SourceInfo info, Expression[] argumen
       List<JExpression> args = pop(arguments);
       for (int i = 0; i < args.size(); i++) {
         // Account for varargs parameter.
-        int parameterIndex = Math.min(i, methodBinding.parameters.length - 1);
+        int parameterIndex = Math.min(i, methodBinding.original().parameters.length - 1);
         args.set(i, maybeBoxOrUnbox(
             args.get(i),
             arguments[i].implicitConversion,
             isDoNotAutoBoxParameter(methodBinding, parameterIndex)));
       }
-      if (!methodBinding.isVarargs()) {
+      if (!methodBinding.original().isVarargs()) {
         return args;
       }
 
@@ -3272,7 +3272,8 @@ private List<JExpression> popCallArguments(SourceInfo info, Expression[] argumen
         args = Lists.newArrayListWithCapacity(1);
       }
 
-      TypeBinding[] params = methodBinding.parameters;
+      TypeBinding[] params = methodBinding.isVarargs() ? methodBinding.parameters :
+              methodBinding.original().parameters;
       int varArg = params.length - 1;
 
       // See if there's a single varArg which is already an array.