GROOVY-10897

eric-milles · eric-milles · commit b24f7be81724 · 2023-01-16T15:23:50.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -6820,4 +6820,34 @@ public void testTypeChecked10890() {
 
         runConformTest(sources);
     }
+
+    @Test
+    public void testTypeChecked10897() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "interface A {\n" +
+            "  def m()\n" +
+            "}\n" +
+            "interface B extends A {\n" +
+            "  @Override def m()\n" +
+            "}\n" +
+            "class C implements A {\n" +
+            "  @Override def m() { 'C' }\n" +
+            "}\n" +
+            "class D extends C implements B {\n" +
+            "}\n" +
+            "class E extends D {\n" +
+            "  @groovy.transform.TypeChecked\n" +
+            "  @Override\n" +
+            "  def m() {\n" +
+            "    'E then ' + super.m()\n" +
+            "  }\n" +
+            "}\n" +
+            "print new E().m()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "E then C");
+    }
 }
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -1304,6 +1304,10 @@ private static List<MethodNode> removeCovariantsAndInterfaceEquivalents(final Co
                         }
                     } else if (!oneDC.equals(twoDC)) {
                         if (ParameterUtils.parametersEqual(one.getParameters(), two.getParameters())) {
+                            // GRECLIPSE add -- GROOVY-10897
+                            if ( twoDC.isInterface() && !one.isAbstract() && !(two instanceof ExtensionMethodNode) ) {
+                                toBeRemoved.add(two);
+                            } else
                             // GROOVY-6882, GROOVY-6970: drop overridden or interface equivalent method
                             if (twoDC.isInterface() ? oneDC.implementsInterface(twoDC) : oneDC.isDerivedFrom(twoDC)) {
                                 toBeRemoved.add(two);
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -1236,6 +1236,10 @@ private static List<MethodNode> removeCovariantsAndInterfaceEquivalents(final Co
                         }
                     } else if (!oneDC.equals(twoDC)) {
                         if (ParameterUtils.parametersEqual(one.getParameters(), two.getParameters())) {
+                            // GRECLIPSE add -- GROOVY-10897
+                            if ( twoDC.isInterface() && !one.isAbstract() && !(two instanceof ExtensionMethodNode) ) {
+                                toBeRemoved.add(two);
+                            } else
                             // GROOVY-6882, GROOVY-6970: drop overridden or interface equivalent method
                             if (twoDC.isInterface() ? oneDC.implementsInterface(twoDC) : oneDC.isDerivedFrom(twoDC)) {
                                 toBeRemoved.add(two);
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -1233,7 +1233,8 @@ private static List<MethodNode> removeCovariantsAndInterfaceEquivalents(final Co
                     } else if (!oneDC.equals(twoDC)) {
                         if (ParameterUtils.parametersEqual(one.getParameters(), two.getParameters())) {
                             // GROOVY-6882, GROOVY-6970: drop overridden or interface equivalent method
-                            if (twoDC.isInterface() ? oneDC.implementsInterface(twoDC) : oneDC.isDerivedFrom(twoDC)) {
+                            if (!twoDC.isInterface() ? oneDC.isDerivedFrom(twoDC) : oneDC.implementsInterface(twoDC) || // GROOVY-10897: concrete vs. abstract
+                                                                                    (!disjoint && !one.isAbstract() && !(two instanceof ExtensionMethodNode))) {
                                 toBeRemoved.add(two);
                             } else if (oneDC.isInterface() ? (disjoint ? twoDC.implementsInterface(oneDC) : twoDC.isInterface()) : twoDC.isDerivedFrom(oneDC)) {
                                 toBeRemoved.add(one);
