GROOVY-9737

eric-milles · eric-milles · commit 9647879a7de0 · 2021-01-25T16:37:43.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
@@ -5241,6 +5241,85 @@ public void testCompileStatic9734() {
         runConformTest(sources, "");
     }
 
+    @Test
+    public void testCompileStatic9737() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class C extends p.A {\n" +
+            "  void test() {\n" +
+            "    m('')\n" + // VerifyError: Bad access to protected data in invokevirtual
+            "  }\n" +
+            "}\n" +
+            "new C().test()\n",
+
+            "p/A.groovy",
+            "package p\n" +
+            "@groovy.transform.CompileStatic\n" +
+            "abstract class A {\n" +
+            "  static void m(Integer i) { print 'int' }\n" +
+            "  protected void m(String s) { print 'str' }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "str");
+    }
+
+    @Test
+    public void testCompileStatic9737a() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "abstract class A {\n" +
+            "  static void m(Integer i) { print 'int' }\n" +
+            "  protected void m(String s) { print 'str' }\n" +
+            "}\n" +
+            "@groovy.transform.CompileStatic\n" +
+            "class C extends A {\n" +
+            "  void test() {\n" +
+            "    m('')\n" + // ClassCastException: class java.lang.Class cannot be cast to class A
+            "  }\n" +
+            "}\n" +
+            "new C().test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "str");
+    }
+
+    @Test @Ignore
+    public void testCompileStatic9737b() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class C extends p.A {\n" +
+            "  void test() {\n" +
+            "    m('')\n" + // VerifyError: Bad access to protected data in invokevirtual
+            "  }\n" +
+            "}\n" +
+            "new C().test()\n",
+
+            "p/A.groovy",
+            "package p\n" +
+            "abstract class A implements I {\n" +
+            "  static void m(Integer i) { print 'int' }\n" +
+            "}\n",
+
+            "p/I.java",
+            "package p;\n" +
+            "interface I {\n" +
+            "  default void m(String s) { System.out.print(\"str\"); }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "str");
+    }
+
     @Test
     public void testCompileStatic9762() {
         assumeTrue(isParrotParser());
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
@@ -1360,7 +1360,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
         }
 
         for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {
-            for (MethodNode mn : getDeclaredMethods(name)) {
+            for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737
                 if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {
                     return true;
                 }
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
@@ -1323,7 +1323,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
         }
 
         for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {
-            for (MethodNode mn : getDeclaredMethods(name)) {
+            for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737
                 if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {
                     return true;
                 }
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
@@ -1333,11 +1333,20 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)
         }
 
         for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {
-            for (MethodNode mn : getDeclaredMethods(name)) {
+            for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737
                 if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {
                     return true;
                 }
             }
+            // GRECLIPSE add -- GROOVY-9737
+            for (ClassNode in : cn.getAllInterfaces()) {
+                for (MethodNode mn : in.getDeclaredMethods(name)) {
+                    if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {
+                        return true;
+                    }
+                }
+            }
+            // GRECLIPSE end
         }
 
         return false;

Original file line number	Diff line number	Diff line change
`@@ -1360,7 +1360,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`	`1362`	`for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {`
`1363`		`- for (MethodNode mn : getDeclaredMethods(name)) {`
	`1363`	`+ for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737`
`1364`	`1364`	`if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {`
`1365`	`1365`	`return true;`
`1366`	`1366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1323,7 +1323,7 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1323`	`1323`	`}`
`1324`	`1324`
`1325`	`1325`	`for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {`
`1326`		`- for (MethodNode mn : getDeclaredMethods(name)) {`
	`1326`	`+ for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737`
`1327`	`1327`	`if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {`
`1328`	`1328`	`return true;`
`1329`	`1329`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1333,11 +1333,20 @@ public boolean hasPossibleMethod(final String name, final Expression arguments)`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`	`1335`	`for (ClassNode cn = this; cn != null; cn = cn.getSuperClass()) {`
`1336`		`- for (MethodNode mn : getDeclaredMethods(name)) {`
	`1336`	`+ for (MethodNode mn : cn.getDeclaredMethods(name)) { //GROOVY-9737`
`1337`	`1337`	`if (!mn.isStatic() && hasCompatibleNumberOfArgs(mn, count)) {`
`1338`	`1338`	`return true;`
`1339`	`1339`	`}`
`1340`	`1340`	`}`
	`1341`	`+ // GRECLIPSE add -- GROOVY-9737`
	`1342`	`+ for (ClassNode in : cn.getAllInterfaces()) {`
	`1343`	`+ for (MethodNode mn : in.getDeclaredMethods(name)) {`
	`1344`	`+ if (mn.isDefault() && hasCompatibleNumberOfArgs(mn, count)) {`
	`1345`	`+ return true;`
	`1346`	`+ }`
	`1347`	`+ }`
	`1348`	`+ }`
	`1349`	`+ // GRECLIPSE end`
`1341`	`1350`	`}`
`1342`	`1351`
`1343`	`1352`	`return false;`