You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/07/04 01:46:31 UTC
[groovy] branch GROOVY_2_5_X updated: sync with 3_0_X (ignores
bridge methods when non-bridge method exists)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
new 62b977a sync with 3_0_X (ignores bridge methods when non-bridge method exists)
62b977a is described below
commit 62b977ad1c4fcb8c55e1f0f7f78afa33bb5304d6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jul 4 11:46:21 2020 +1000
sync with 3_0_X (ignores bridge methods when non-bridge method exists)
---
.../codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index b8af55f..27426ff 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4302,10 +4302,12 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
private List<MethodNode> disambiguateMethods(List<MethodNode> methods, ClassNode receiver, ClassNode[] argTypes, final Expression expr) {
if (methods.size() > 1 && receiver != null && argTypes != null) {
- List<MethodNode> filteredWithGenerics = new LinkedList<MethodNode>();
+ List<MethodNode> filteredWithGenerics = new LinkedList<>();
for (MethodNode methodNode : methods) {
if (typeCheckMethodsWithGenerics(receiver, argTypes, methodNode)) {
- filteredWithGenerics.add(methodNode);
+ if ((methodNode.getModifiers() & Opcodes.ACC_BRIDGE) == 0) {
+ filteredWithGenerics.add(methodNode);
+ }
}
}
if (filteredWithGenerics.size() == 1) {