GROOVY-10230, GROOVY-10344

groovy · Nov 4, 2021 · a0d1141 · a0d1141
1 parent f4a0f02
commit a0d1141
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 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
@@ -3936,6 +3936,37 @@ public void testTypeChecked10228() {
         runConformTest(sources, "works");
     }
 
+    @Test
+    public void testTypeChecked10230() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "class A {\n" +
+            "  def <T extends C<Number,Number>> T m(T t) {\n" +
+            "    return t\n" +
+            "  }\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "class B extends A {\n" +
+            "  @Override\n" +
+            "  def <T extends C<Number,Number>> T m(T t) {\n" +
+            "    T x = null; super.m(true ? t : x)\n" +
+            "  }\n" +
+            "}\n" +
+            "class C<X,Y> {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  new B().m(new C<>())\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testTypeChecked10234() {
         //@formatter:off
@@ -4607,4 +4638,24 @@ public void testTypeChecked10339() {
             "Groovy:[Static type checking] - Cannot assign value of type java.io.Serializable<? extends java.io.Serializable<java.lang.String>> to variable of type java.lang.Integer\n" +
             "----------\n");
     }
+
+    @Test
+    public void testTypeChecked10344() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C<X,Y> {\n" +
+            "}\n" +
+            "def <T extends C<? extends Number, ? extends Number>> void m(T t1, T t2) {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  m(new C<>(), new C<>())\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
 }
diff --git a/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1217,7 +1217,7 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
         // check if constructor call expression makes use of the diamond operator
         if (cceType.getGenericsTypes() != null && cceType.getGenericsTypes().length == 0) {
             ArgumentListExpression argumentListExpression = InvocationWriter.makeArgumentList(cce.getArguments());
-            /* GRECLIPSE edit -- GROOVY-9948, GROOVY-9983, GROOVY-10291
+            /* GRECLIPSE edit -- GROOVY-9948, GROOVY-9983, GROOVY-10291, et al.
             if (argumentListExpression.getExpressions().isEmpty()) {
                 adjustGenerics(lType, cceType);
             } else {
@@ -1251,6 +1251,9 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
                 }
                 inferredType = type;
             }
+            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+                inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
+
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
             // GRECLIPSE end

diff --git a/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1114,7 +1114,7 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
         ClassNode cceType = cce.getType(), inferredType = lType;
         // check if constructor call expression makes use of the diamond operator
         if (cceType.getGenericsTypes() != null && cceType.getGenericsTypes().length == 0) {
-            /* GRECLIPSE edit -- GROOVY-9948, GROOVY-9983, GROOVY-10291
+            /* GRECLIPSE edit -- GROOVY-9948, GROOVY-9983, GROOVY-10291, et al.
             ArgumentListExpression argumentListExpression = InvocationWriter.makeArgumentList(cce.getArguments());
             if (argumentListExpression.getExpressions().isEmpty()) {
                 adjustGenerics(lType, cceType);
@@ -1150,6 +1150,9 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
                 }
                 inferredType = type;
             }
+            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+                inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
+
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
             // GRECLIPSE end

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -1115,6 +1115,9 @@ protected void inferDiamondType(final ConstructorCallExpression cce, final Class
                 }
                 inferredType = type;
             }
+            if (inferredType.isGenericsPlaceHolder()) // GROOVY-10344: "T t = new C<>()"
+                inferredType = getCombinedBoundType(inferredType.getGenericsTypes()[0]);
+
             adjustGenerics(inferredType, cceType);
             storeType(cce, cceType);
         }