GROOVY-10725

eric-milles · eric-milles · commit 04c62e5227f8 · 2022-08-20T20:11:57.000-05: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
@@ -6180,4 +6180,22 @@ public void testTypeChecked10701() {
 
         runConformTest(sources, "42.0");
     }
+
+    @Test
+    public void testTypeChecked10725() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test(List<String> strings) {\n" +
+            "  Set<Map<String,String>> set_of_maps = []\n" +
+            "  set_of_maps.addAll(strings.collectEntries{ [it,it.toUpperCase()] })\n" +
+            "  print set_of_maps\n" +
+            "}\n" +
+            "test(['foo','bar'])\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "[[foo:FOO, bar:BAR]]");
+    }
 }
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -6331,7 +6331,10 @@ else if (a instanceof ListExpression) {
             // and unknown generics
             if (!GenericsUtils.hasUnresolvedGenerics(at)) continue;
 
-            while (!at.equals(pt) && !at.equals(OBJECT_TYPE)) {
+            while (!at.equals(pt)
+                    && !at.equals(OBJECT_TYPE)
+                    && !isGenericsPlaceHolderOrArrayOf(at)
+                    && !isGenericsPlaceHolderOrArrayOf(pt)) {
                 ClassNode sc = GenericsUtils.getSuperClass(at, pt);
                 at = applyGenericsContext(GenericsUtils.extractPlaceholders(at), sc);
             }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -6028,7 +6028,10 @@ else if (a instanceof ListExpression) {
             // and unknown generics
             if (!GenericsUtils.hasUnresolvedGenerics(at)) continue;
 
-            while (!at.equals(pt) && !at.equals(OBJECT_TYPE)) {
+            while (!at.equals(pt)
+                    && !at.equals(OBJECT_TYPE)
+                    && !isGenericsPlaceHolderOrArrayOf(at)
+                    && !isGenericsPlaceHolderOrArrayOf(pt)) {
                 ClassNode sc = GenericsUtils.getSuperClass(at, pt);
                 at = applyGenericsContext(GenericsUtils.extractPlaceholders(at), sc);
             }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5512,7 +5512,7 @@ private void resolvePlaceholdersFromImplicitTypeHints(final ClassNode[] actuals,
             // and unknown generics
             if (!GenericsUtils.hasUnresolvedGenerics(at)) continue;
 
-            while (!at.equals(pt) && !isObjectType(at) && !isGenericsPlaceHolderOrArrayOf(at)) {
+            while (!at.equals(pt) && !isObjectType(at) && !isGenericsPlaceHolderOrArrayOf(at) && !isGenericsPlaceHolderOrArrayOf(pt)) {
                 at = applyGenericsContext(GenericsUtils.extractPlaceholders(at), getNextSuperClass(at, pt));
             }
 

Original file line number	Diff line number	Diff line change
`@@ -5512,7 +5512,7 @@ private void resolvePlaceholdersFromImplicitTypeHints(final ClassNode[] actuals,`
`5512`	`5512`	`// and unknown generics`
`5513`	`5513`	`if (!GenericsUtils.hasUnresolvedGenerics(at)) continue;`
`5514`	`5514`
`5515`		`- while (!at.equals(pt) && !isObjectType(at) && !isGenericsPlaceHolderOrArrayOf(at)) {`
	`5515`	`+ while (!at.equals(pt) && !isObjectType(at) && !isGenericsPlaceHolderOrArrayOf(at) && !isGenericsPlaceHolderOrArrayOf(pt)) {`
`5516`	`5516`	`at = applyGenericsContext(GenericsUtils.extractPlaceholders(at), getNextSuperClass(at, pt));`
`5517`	`5517`	`}`
`5518`	`5518`