[groovy] branch GROOVY_4_0_X updated: GROOVY-10467: trait: clear transient/varargs modifier from helper method

[em...@apache.org]

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

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


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new 03c03ad  GROOVY-10467: trait: clear transient/varargs modifier from helper method
03c03ad is described below

commit 03c03ad011b815651d7021ded1785adf1ed877bb
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Feb 1 13:09:41 2022 -0600

    GROOVY-10467: trait: clear transient/varargs modifier from helper method
---
 .../groovy/transform/trait/TraitComposer.java      |  5 +-
 src/test/groovy/bugs/Groovy10467.groovy            | 79 ++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
index c9db784..4486889 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -346,8 +346,11 @@ public abstract class TraitComposer {
         }
         int modifiers = helperMethod.getModifiers();
         if (!isHelperForStaticMethod) {
-            modifiers ^= Opcodes.ACC_STATIC;
+            modifiers &= ~Opcodes.ACC_STATIC;
         }
+        // GROOVY-10467: added by classgen
+        modifiers &= ~Opcodes.ACC_VARARGS;
+
         MethodNode forwarder = new MethodNode(
                 helperMethod.getName(),
                 modifiers,
diff --git a/src/test/groovy/bugs/Groovy10467.groovy b/src/test/groovy/bugs/Groovy10467.groovy
new file mode 100644
index 0000000..a1691da
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy10467.groovy
@@ -0,0 +1,79 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package groovy.bugs
+
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+final class Groovy10467 {
+
+    @Test
+    void testAutoImplementVargs() {
+        assertScript """
+            @groovy.transform.AutoImplement
+            class C implements ${getClass().getName()}.I {
+            }
+
+            new C().m()
+        """
+    }
+
+    @Test
+    void testDelegateVargs() {
+        assertScript """
+            import ${getClass().getName()}.A
+            class C {
+                @Delegate A a = new A(null) {
+                    void m(String... strings) {
+                    }
+                }
+            }
+
+            new C().m()
+        """
+    }
+
+    @Test
+    void testTraitVargs() {
+        assertScript """
+            abstract class A {
+                class C implements ${getClass().getName()}.T {
+                }
+            }
+
+            def a = new A() {}
+            def c = new A.C(a)
+            c.m()
+        """
+    }
+
+    abstract class A {
+        abstract void m(String... strings)
+    }
+
+    interface I {
+        void m(String... strings)
+    }
+
+    trait T {
+        void m(String... strings) {
+        }
+    }
+}