GROOVY-10847

eric-milles · eric-milles · commit 200038a67f38 · 2022-11-19T09:31:55.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
@@ -6677,4 +6677,26 @@ public void testTypeChecked10846() {
 
         runConformTest(sources);
     }
+
+    @Test
+    public void testTypeChecked10847() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class A<T, U> {\n" +
+            "}\n" +
+            "class B {\n" +
+            "  def <X extends A<Character, Boolean>, Y extends X> void m(X x, Y y) {\n" +
+            "  }\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "test() {\n" +
+            "  new B().m(null, new A<>())\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
 }
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
@@ -1160,9 +1160,10 @@ && checkCompatibleAssignmentTypes(lType, type, cce) && !GenericsUtils.buildWildc
                 }
                 inferredType = type;
             }
-            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+            // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter
+            while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {
                 inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
-
+            }
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
         }
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
@@ -1119,9 +1119,10 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
                 }
                 inferredType = type;
             }
-            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+            // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter
+            while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {
                 inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
-
+            }
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
         }
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
@@ -1123,9 +1123,10 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
                 }
                 inferredType = type;
             }
-            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+            // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter
+            while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {
                 inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
-
+            }
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
         }

Original file line number	Diff line number	Diff line change
`@@ -1160,9 +1160,10 @@ && checkCompatibleAssignmentTypes(lType, type, cce) && !GenericsUtils.buildWildc`
`1160`	`1160`	`}`
`1161`	`1161`	`inferredType = type;`
`1162`	`1162`	`}`
`1163`		`- if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"`
	`1163`	`+ // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter`
	`1164`	`+ while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {`
`1164`	`1165`	`inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);`
`1165`		`-`
	`1166`	`+ }`
`1166`	`1167`	`adjustGenerics(inferredType, cceType);`
`1167`	`1168`	`storeType(cce, cceType);`
`1168`	`1169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1119,9 +1119,10 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class`
`1119`	`1119`	`}`
`1120`	`1120`	`inferredType = type;`
`1121`	`1121`	`}`
`1122`		`- if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"`
	`1122`	`+ // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter`
	`1123`	`+ while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {`
`1123`	`1124`	`inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);`
`1124`		`-`
	`1125`	`+ }`
`1125`	`1126`	`adjustGenerics(inferredType, cceType);`
`1126`	`1127`	`storeType(cce, cceType);`
`1127`	`1128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1123,9 +1123,10 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class`
`1123`	`1123`	`}`
`1124`	`1124`	`inferredType = type;`
`1125`	`1125`	`}`
`1126`		`- if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"`
	`1126`	`+ // GROOVY-10344, GROOVY-10847: "T t = new C<>()" where "T" may extend another type parameter`
	`1127`	`+ while (inferredType.isGenericsPlaceHolder() && asBoolean(inferredType.getGenericsTypes())) {`
`1127`	`1128`	`inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);`
`1128`		`-`
	`1129`	`+ }`
`1129`	`1130`	`adjustGenerics(inferredType, cceType);`
`1130`	`1131`	`storeType(cce, cceType);`
`1131`	`1132`	`}`