You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/01 19:10:17 UTC
[groovy] branch GROOVY-10467 created (now 14df66b)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY-10467
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 14df66b GROOVY-10467: trait: clear transient/varargs modifier from helper method
This branch includes the following new commits:
new 14df66b GROOVY-10467: trait: clear transient/varargs modifier from helper method
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: GROOVY-10467: trait: clear transient/varargs modifier from helper method
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY-10467
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 14df66b48247aaaa2b46fd11f4ba2fc183288fab
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 | 45 ++++++++++++++++++++++
2 files changed, 49 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..ede5423
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy10467.groovy
@@ -0,0 +1,45 @@
+/*
+ * 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 testTraitVargs() {
+ assertScript """
+ abstract class A {
+ class C implements ${getClass().getName()}.T {
+ }
+ }
+
+ def a = new A() {}
+ def c = new A.C(a)
+ c.expectFiles()
+ """
+ }
+
+ trait T {
+ void expectFiles(String... fileNames) {
+ }
+ }
+}