GROOVY-10379

groovy · Nov 26, 2021 · 363d640 · 363d640
1 parent bc05754
commit 363d640
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 1 deletion.
diff --git a/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java
@@ -6752,4 +6752,38 @@ public void testCompileStatic10377() {
         checkDisassemblyFor("Main.class", "if_acmpne"); // ===
         checkDisassemblyFor("Main.class", "if_acmpeq"); // !==
     }
+
+    @Test
+    public void testCompileStatic10379() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class C extends p.A {\n" +
+            "  void test() {\n" +
+            "    m('')\n" +
+            "  }\n" +
+            "}\n" +
+            "new C().test()\n",
+
+            "p/A.groovy",
+            "package p\n" +
+            "abstract class A implements I {\n" +
+            "  static void m(Number n) {\n" +
+            "    print 'number'\n" +
+            "  }\n" +
+            "}\n",
+
+            "p/I.java",
+            "package p;\n" +
+            "public interface I {\n" +
+            "  default void m(String s) {\n" +
+            "    System.out.print(\"string\");\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "string");
+    }
 }
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassNode.java
@@ -1321,6 +1321,15 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
                     return true;
                 }
             }
+            // GRECLIPSE add -- GROOVY-10379
+            for (ClassNode in : cn.getAllInterfaces()) {
+                for (MethodNode mn : in.getDeclaredMethods(name)) {
+                    if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {
+                        return true;
+                    }
+                }
+            }
+            // GRECLIPSE end
         }
 
         return false;

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassNode.java
@@ -1312,6 +1312,15 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
                     return true;
                 }
             }
+            // GRECLIPSE add -- GROOVY-10379
+            for (ClassNode in : cn.getAllInterfaces()) {
+                for (MethodNode mn : in.getDeclaredMethods(name)) {
+                    if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {
+                        return true;
+                    }
+                }
+            }
+            // GRECLIPSE end
         }
 
         return false;

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ClassNode.java
@@ -1337,7 +1337,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
                     return true;
                 }
             }
-            // GRECLIPSE add -- GROOVY-9737
+            // GRECLIPSE add -- GROOVY-10379
             for (ClassNode in : cn.getAllInterfaces()) {
                 for (MethodNode mn : in.getDeclaredMethods(name)) {
                     if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {