GROOVY-5502 (pt.1)

eric-milles · eric-milles · commit 0873c66363ee · 2021-12-12T13:36:31.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
@@ -526,6 +526,38 @@ public void testTypeChecked5450() {
             "----------\n");
     }
 
+    @Test
+    public void testTypeChecked5502() {
+        for (String val : new String[] {"null", "new A()", "new B()", "new C()"/*TODO:, "new Object()"*/}) {
+            //@formatter:off
+            String[] sources = {
+                "Main.groovy",
+                "class A {\n" +
+                "  void m() {\n" +
+                "  }\n" +
+                "}\n" +
+                "class B extends A {\n" +
+                "}\n" +
+                "class C extends A {\n" +
+                "}\n" +
+                "@groovy.transform.TypeChecked\n" +
+                "void test(boolean flag) {\n" +
+                "  def var = " + val + "\n" +
+                "  if (flag) {\n" +
+                "    var = new B()\n" +
+                "  } else {\n" +
+                "    var = new C()\n" +
+                "  }\n" +
+                "  var.m()\n" + // Cannot find matching method Object#m()
+                "}\n" +
+                "test(true)\n",
+            };
+            //@formatter:on
+
+            runConformTest(sources);
+        }
+    }
+
     @Test
     public void testTypeChecked5523() {
         //@formatter:off
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
@@ -977,7 +977,12 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
                 }
             }
 
+            /* GRECLIPSE edit -- GROOVY-5502
             boolean isEmptyDeclaration = expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression;
+            */
+            boolean isEmptyDeclaration = (expression instanceof DeclarationExpression
+                    && (rightExpression instanceof EmptyExpression || rType == UNKNOWN_PARAMETER_TYPE));
+            // GRECLIPSE end
             if (!isEmptyDeclaration && isAssignment(op)) {
                 if (rightExpression instanceof ConstructorCallExpression) {
                     inferDiamondType((ConstructorCallExpression) rightExpression, lType);
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
@@ -862,7 +862,12 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
                 }
             }
 
+            /* GRECLIPSE edit -- GROOVY-5502
             boolean isEmptyDeclaration = (expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression);
+            */
+            boolean isEmptyDeclaration = (expression instanceof DeclarationExpression
+                    && (rightExpression instanceof EmptyExpression || rType == UNKNOWN_PARAMETER_TYPE));
+            // GRECLIPSE end
             if (isAssignment(op) && !isEmptyDeclaration) {
                 if (rightExpression instanceof ConstructorCallExpression) {
                     inferDiamondType((ConstructorCallExpression) rightExpression, lType);
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
@@ -856,7 +856,8 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
                 }
             }
 
-            boolean isEmptyDeclaration = (expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression);
+            boolean isEmptyDeclaration = (expression instanceof DeclarationExpression
+                    && (rightExpression instanceof EmptyExpression || rType == UNKNOWN_PARAMETER_TYPE));
             if (!isEmptyDeclaration && isAssignment(op)) {
                 if (rightExpression instanceof ConstructorCallExpression)
                     inferDiamondType((ConstructorCallExpression) rightExpression, lType);

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,12 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {`
`977`	`977`	`}`
`978`	`978`	`}`
`979`	`979`
	`980`	`+ /* GRECLIPSE edit -- GROOVY-5502`
`980`	`981`	`boolean isEmptyDeclaration = expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression;`
	`982`	`+ */`
	`983`	`+ boolean isEmptyDeclaration = (expression instanceof DeclarationExpression`
	`984`	`+ && (rightExpression instanceof EmptyExpression \|\| rType == UNKNOWN_PARAMETER_TYPE));`
	`985`	`+ // GRECLIPSE end`
`981`	`986`	`if (!isEmptyDeclaration && isAssignment(op)) {`
`982`	`987`	`if (rightExpression instanceof ConstructorCallExpression) {`
`983`	`988`	`inferDiamondType((ConstructorCallExpression) rightExpression, lType);`
Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,12 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {`
`862`	`862`	`}`
`863`	`863`	`}`
`864`	`864`
	`865`	`+ /* GRECLIPSE edit -- GROOVY-5502`
`865`	`866`	`boolean isEmptyDeclaration = (expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression);`
	`867`	`+ */`
	`868`	`+ boolean isEmptyDeclaration = (expression instanceof DeclarationExpression`
	`869`	`+ && (rightExpression instanceof EmptyExpression \|\| rType == UNKNOWN_PARAMETER_TYPE));`
	`870`	`+ // GRECLIPSE end`
`866`	`871`	`if (isAssignment(op) && !isEmptyDeclaration) {`
`867`	`872`	`if (rightExpression instanceof ConstructorCallExpression) {`
`868`	`873`	`inferDiamondType((ConstructorCallExpression) rightExpression, lType);`
Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,8 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {`
`856`	`856`	`}`
`857`	`857`	`}`
`858`	`858`
`859`		`- boolean isEmptyDeclaration = (expression instanceof DeclarationExpression && rightExpression instanceof EmptyExpression);`
	`859`	`+ boolean isEmptyDeclaration = (expression instanceof DeclarationExpression`
	`860`	`+ && (rightExpression instanceof EmptyExpression \|\| rType == UNKNOWN_PARAMETER_TYPE));`
`860`	`861`	`if (!isEmptyDeclaration && isAssignment(op)) {`
`861`	`862`	`if (rightExpression instanceof ConstructorCallExpression)`
`862`	`863`	`inferDiamondType((ConstructorCallExpression) rightExpression, lType);`