GROOVY-10267, GROOVY-10576

groovy · May 1, 2022 · 82f5d45 · 82f5d45
1 parent 97a612e
commit 82f5d45
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -4576,6 +4576,26 @@ public void testTypeChecked10254() {
         runConformTest(sources, "42");
     }
 
+    @Test
+    public void testTypeChecked10267() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C<T> {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "C<? extends Object> test() {\n" +
+            "  test2()\n" +
+            "}\n" +
+            "C<? extends Object> test2() {\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testTypeChecked10269() {
         assumeTrue(isParrotParser());

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/GenericsType.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/GenericsType.java
@@ -487,8 +487,8 @@ private boolean compareGenericsWithBound(final ClassNode classNode, final ClassN
                                                         match = gt.new GenericsTypeMatcher().checkGenerics(classNodeType.getLowerBound());
                                                     } else if (classNodeType.getUpperBounds() != null) {
                                                         match = gt.new GenericsTypeMatcher().checkGenerics(classNodeType.getUpperBounds()[0]);
-                                                    } else {
-                                                        match = false; // "?" (from Comparable<?>) does not satisfy anything
+                                                    } else { // GROOVY-10267, GROOVY-10576: "?" vs "? extends Object" (citation required) or no match
+                                                        match = (!gt.isPlaceholder() && !gt.isWildcard() && ClassHelper.OBJECT_TYPE.equals(gt.getType()));
                                                     }
                                                 } else {
                                                     match = implementsInterfaceOrIsSubclassOf(classNodeType.getType(), gt.getType());

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/GenericsType.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/GenericsType.java
@@ -470,8 +470,8 @@ private static boolean compareGenericsWithBound(final ClassNode classNode, final
                                                 match = gt.checkGenerics(classNodeType.getLowerBound());
                                             } else if (classNodeType.getUpperBounds() != null) {
                                                 match = gt.checkGenerics(classNodeType.getUpperBounds()[0]);
-                                            } else {
-                                                match = false; // "?" (from Comparable<?>) does not satisfy anything
+                                            } else { // GROOVY-10267, GROOVY-10576: "?" vs "? extends Object" (citation required) or no match
+                                                match = (!gt.isPlaceholder() && !gt.isWildcard() && ClassHelper.OBJECT_TYPE.equals(gt.getType()));
                                             }
                                         } else {
                                             match = implementsInterfaceOrIsSubclassOf(classNodeType.getType(), gt.getType());