GROOVY-9997

eric-milles · eric-milles · commit 07adab7a87f3 · 2021-03-22T22:43:17.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
@@ -1359,4 +1359,21 @@ public void testTypeChecked9995() {
 
         runConformTest(sources, "1");
     }
+
+    @Test
+    public void testTypeChecked9997() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  def cast = (Comparator<Integer>) { a, b -> Integer.compare(a, b) }\n" +
+            "  def coerce = { a, b -> Integer.compare(a, b) } as Comparator<Integer>\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
@@ -4427,6 +4427,7 @@ protected Map<VariableExpression, List<ClassNode>> pushAssignmentTracking() {
 
     @Override
     public void visitCastExpression(final CastExpression expression) {
+        /* GRECLIPSE edit -- GROOVY-9997
         super.visitCastExpression(expression);
         if (!expression.isCoerce()) {
             ClassNode targetType = expression.getType();
@@ -4437,6 +4438,19 @@ public void visitCastExpression(final CastExpression expression) {
             }
         }
         storeType(expression, expression.getType());
+        */
+        ClassNode type = expression.getType();
+        Expression source = expression.getExpression();
+        if (isFunctionalInterface(type)) {
+            processFunctionalInterfaceAssignment(type, source);
+        }
+
+        source.visit(this);
+
+        if (!expression.isCoerce() && !checkCast(type, source) && !isDelegateOrOwnerInClosure(source)) {
+            addStaticTypeError("Inconvertible types: cannot cast " + prettyPrintType(getType(source)) + " to " + prettyPrintType(type), expression);
+        }
+        // GRECLIPSE end
     }
 
     private boolean isDelegateOrOwnerInClosure(Expression exp) {
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
@@ -4247,6 +4247,7 @@ protected Map<VariableExpression, List<ClassNode>> pushAssignmentTracking() {
 
     @Override
     public void visitCastExpression(final CastExpression expression) {
+        /* GRECLIPSE edit -- GROOVY-9997
         super.visitCastExpression(expression);
         if (!expression.isCoerce()) {
             ClassNode targetType = expression.getType();
@@ -4257,6 +4258,19 @@ public void visitCastExpression(final CastExpression expression) {
             }
         }
         storeType(expression, expression.getType());
+        */
+        ClassNode type = expression.getType();
+        Expression source = expression.getExpression();
+        if (isFunctionalInterface(type)) {
+            processFunctionalInterfaceAssignment(type, source);
+        }
+
+        source.visit(this);
+
+        if (!expression.isCoerce() && !checkCast(type, source) && !isDelegateOrOwnerInClosure(source)) {
+            addStaticTypeError("Inconvertible types: cannot cast " + prettyPrintType(getType(source)) + " to " + prettyPrintType(type), expression);
+        }
+        // GRECLIPSE end
     }
 
     private boolean isDelegateOrOwnerInClosure(final Expression exp) {
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
@@ -1961,7 +1961,7 @@ public void visitField(final FieldNode node) {
                 if (init instanceof ConstructorCallExpression) {
                     inferDiamondType((ConstructorCallExpression) init, node.getOriginType());
                 }
-                 */
+                */
                 typeCheckAssignment(bexp, left, lType, init, getResultType(lType, ASSIGN, rType, bexp));
                 // GRECLIPSE end
             }
@@ -4213,6 +4213,7 @@ protected Map<VariableExpression, List<ClassNode>> pushAssignmentTracking() {
 
     @Override
     public void visitCastExpression(final CastExpression expression) {
+        /* GRECLIPSE edit -- GROOVY-9997
         super.visitCastExpression(expression);
         if (!expression.isCoerce()) {
             ClassNode targetType = expression.getType();
@@ -4223,6 +4224,19 @@ public void visitCastExpression(final CastExpression expression) {
             }
         }
         storeType(expression, expression.getType());
+        */
+        ClassNode type = expression.getType();
+        Expression source = expression.getExpression();
+        if (isFunctionalInterface(type)) {
+            processFunctionalInterfaceAssignment(type, source);
+        }
+
+        source.visit(this);
+
+        if (!expression.isCoerce() && !checkCast(type, source) && !isDelegateOrOwnerInClosure(source)) {
+            addStaticTypeError("Inconvertible types: cannot cast " + prettyPrintType(getType(source)) + " to " + prettyPrintType(type), expression);
+        }
+        // GRECLIPSE end
     }
 
     private boolean isDelegateOrOwnerInClosure(final Expression exp) {
