GROOVY-10379

eric-milles · eric-milles · commit 363d64053cf0 · 2021-11-26T14:47:55.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/base-test/org.eclipse.jdt.groovy.core.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)) {

Original file line number	Diff line number	Diff line change
`@@ -1321,6 +1321,15 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1321`	`1321`	`return true;`
`1322`	`1322`	`}`
`1323`	`1323`	`}`
	`1324`	`+ // GRECLIPSE add -- GROOVY-10379`
	`1325`	`+ for (ClassNode in : cn.getAllInterfaces()) {`
	`1326`	`+ for (MethodNode mn : in.getDeclaredMethods(name)) {`
	`1327`	`+ if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {`
	`1328`	`+ return true;`
	`1329`	`+ }`
	`1330`	`+ }`
	`1331`	`+ }`
	`1332`	`+ // GRECLIPSE end`
`1324`	`1333`	`}`
`1325`	`1334`
`1326`	`1335`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1312,6 +1312,15 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1312`	`1312`	`return true;`
`1313`	`1313`	`}`
`1314`	`1314`	`}`
	`1315`	`+ // GRECLIPSE add -- GROOVY-10379`
	`1316`	`+ for (ClassNode in : cn.getAllInterfaces()) {`
	`1317`	`+ for (MethodNode mn : in.getDeclaredMethods(name)) {`
	`1318`	`+ if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {`
	`1319`	`+ return true;`
	`1320`	`+ }`
	`1321`	`+ }`
	`1322`	`+ }`
	`1323`	`+ // GRECLIPSE end`
`1315`	`1324`	`}`
`1316`	`1325`
`1317`	`1326`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1337,7 +1337,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1337`	`1337`	`return true;`
`1338`	`1338`	`}`
`1339`	`1339`	`}`
`1340`		`- // GRECLIPSE add -- GROOVY-9737`
	`1340`	`+ // GRECLIPSE add -- GROOVY-10379`
`1341`	`1341`	`for (ClassNode in : cn.getAllInterfaces()) {`
`1342`	`1342`	`for (MethodNode mn : in.getDeclaredMethods(name)) {`
`1343`	`1343`	`if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {`