GROOVY-9953

groovy · Feb 25, 2021 · f15b79e · f15b79e
1 parent 625858c
commit f15b79e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 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
@@ -953,4 +953,27 @@ public void testTypeChecked9948() {
 
         runConformTest(sources, "true");
     }
+
+    @Test
+    public void testTypeChecked9953() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class C {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "C test(Object x) {\n" +
+            "  if (x instanceof C) {\n" +
+            "    def y = x\n" +
+            "    return y\n" +
+            "  } else {\n" +
+            "    new C()\n" +
+            "  }\n" +
+            "}\n" +
+            "new C().with { assert test(it).is(it) }\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
@@ -872,11 +872,17 @@ public void visitBinaryExpression(final BinaryExpression expression) {
                 rightExpression.visit(this);
             }
             ClassNode lType = getType(leftExpression);
+            /* GRECLIPSE edit -- GROOVY-9953
             ClassNode rType = getType(rightExpression);
             if (isNullConstant(rightExpression)) {
                 if (!isPrimitiveType(lType))
                     rType = UNKNOWN_PARAMETER_TYPE; // primitive types should be ignored as they will result in another failure
             }
+            */
+            ClassNode rType = isNullConstant(rightExpression) && !isPrimitiveType(lType)
+                    ? UNKNOWN_PARAMETER_TYPE
+                    : getInferredTypeFromTempInfo(rightExpression, getType(rightExpression));
+            // GRECLIPSE end
             BinaryExpression reversedBinaryExpression = binX(rightExpression, expression.getOperation(), leftExpression);
             ClassNode resultType = op == KEYWORD_IN
                     ? getResultType(rType, op, lType, reversedBinaryExpression)

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
@@ -786,7 +786,11 @@ public void visitBinaryExpression(final BinaryExpression expression) {
             ClassNode rType = (isNullConstant(rightExpression) && !isPrimitiveType(lType)
                     // primitive types should be ignored as they will result in another failure
                     ? UNKNOWN_PARAMETER_TYPE
+                    /* GRECLIPSE edit -- GROOVY-9953
                     : getType(rightExpression)
+                    */
+                    : getInferredTypeFromTempInfo(rightExpression, getType(rightExpression))
+                    // GRECLIPSE end
             );
 
             BinaryExpression reversedBinaryExpression = binX(rightExpression, expression.getOperation(), leftExpression);

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
@@ -786,7 +786,11 @@ public void visitBinaryExpression(final BinaryExpression expression) {
             ClassNode rType = (isNullConstant(rightExpression) && !isPrimitiveType(lType)
                     // primitive types should be ignored as they will result in another failure
                     ? UNKNOWN_PARAMETER_TYPE
+                    /* GRECLIPSE edit -- GROOVY-9953
                     : getType(rightExpression)
+                    */
+                    : getInferredTypeFromTempInfo(rightExpression, getType(rightExpression))
+                    // GRECLIPSE end
             );
 
             BinaryExpression reversedBinaryExpression = binX(rightExpression, expression.getOperation(), leftExpression);