GROOVY-9985, GROOVY-10111

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -2186,6 +2186,24 @@ public void testTypeChecked9985() {
 
     @Test
     public void testTypeChecked9985a() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  new char[] {'a','b','c'}\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
+    @Test
+    public void testTypeChecked9985b() {
         //@formatter:off
         String[] sources = {
             "Main.groovy",
@@ -2890,4 +2908,43 @@ public void testTypeChecked10098() {
 
         runConformTest(sources, "42");
     }
+
+    @Test
+    public void testTypeChecked10111() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C<X, Y> { }\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "def <X extends C<Number, String>> X[] m() {\n" +
+            "  new X[]{ new C<Number, String>() }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
+    @Test
+    public void testTypeChecked10111a() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C<X, Y> { }\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "def String[] test() {\n" +
+            "  new String[]{ 1, (long)2, (short)3 }\n" +
+            "}\n" +
+            "def result = test()\n" +
+            "assert result.toString == '[1, 2, 3]'\n" +
+            "assert result.every { it.class == String }\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -4673,8 +4673,8 @@ public void visitArrayExpression(final ArrayExpression expression) {
         // GRECLIPSE add -- GROOVY-9985, GROOVY-9994
         if (expression.getSizeExpression() != null) {
             expression.getSizeExpression().forEach(sizeExpr -> {
-                if (!checkCast(int_TYPE, sizeExpr)) addStaticTypeError(
-                    "Cannot convert from " + prettyPrintType(getType(sizeExpr)) + " to int", sizeExpr);
+                if (!checkCompatibleAssignmentTypes(int_TYPE, getType(sizeExpr), sizeExpr, false))
+                    addStaticTypeError("Cannot convert from " + prettyPrintType(getType(sizeExpr)) + " to int", sizeExpr);
             });
         }
         // GRECLIPSE end

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -4422,7 +4422,7 @@ protected Map<VariableExpression, List<ClassNode>> pushAssignmentTracking() {
     }
 
     @Override
-    /* GRECLIPSE edit -- GROOVY-9985
+    /* GRECLIPSE edit -- GROOVY-9985, GROOVY-10111
     public void visitArrayExpression(ArrayExpression source) {
         super.visitArrayExpression(source);
         ClassNode elementType = source.getElementType();
@@ -4447,7 +4447,7 @@ public void visitArrayExpression(final ArrayExpression expression) {
             expressions = expression.getSizeExpression();
         }
         for (Expression elementExpr : expressions) {
-            if (!checkCast(elementType, elementExpr)) {
+            if (!checkCompatibleAssignmentTypes(elementType, getType(elementExpr), elementExpr, false)) {
                 addStaticTypeError("Cannot convert from " + prettyPrintType(getType(elementExpr)) + " to " + prettyPrintType(elementType), elementExpr);
             }
         }

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -4313,7 +4313,7 @@ protected Map<VariableExpression, List<ClassNode>> pushAssignmentTracking() {
     }
 
     @Override
-    /* GRECLIPSE edit -- GROOVY-9985
+    /* GRECLIPSE edit -- GROOVY-9985, GROOVY-10111
     public void visitArrayExpression(ArrayExpression source) {
         super.visitArrayExpression(source);
         ClassNode elementType = source.getElementType();
@@ -4338,7 +4338,7 @@ public void visitArrayExpression(final ArrayExpression expression) {
             expressions = expression.getSizeExpression();
         }
         for (Expression elementExpr : expressions) {
-            if (!checkCast(elementType, elementExpr)) {
+            if (!checkCompatibleAssignmentTypes(elementType, getType(elementExpr), elementExpr, false)) {
                 addStaticTypeError("Cannot convert from " + prettyPrintType(getType(elementExpr)) + " to " + prettyPrintType(elementType), elementExpr);
             }
         }