GROOVY-10011

eric-milles · eric-milles · commit d6c6b54cb29f · 2021-04-08T11:32:14.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
@@ -2069,4 +2069,27 @@ public void testTypeChecked10010a() {
             "Groovy:[Static type checking] - You are trying to use a GString in place of a String in a type which explicitly declares accepting String. Make sure to call toString() on all GString values.\n" +
             "----------\n");
     }
+
+    @Test
+    public void testTypeChecked10011() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TupleConstructor(defaults=false)\n" +
+            "class C<T> {\n" +
+            "  T p\n" +
+            "}\n" +
+            "interface I { }\n" +
+            "class D implements I { }\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test(I i) {\n" +
+            "  if (i instanceof D)\n" +
+            "    C<D> cd = new C<>(i)\n" +
+            "}\n" +
+            "test(new D())\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
@@ -6147,13 +6147,16 @@ private ClassNode resolveGenericsWithContext(Map<GenericsTypeName, GenericsType>
         return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);
     }
 
-    // GRECLIPSE add
+    // GRECLIPSE add -- GROOVY-9996, GROOVY-10011
     private ClassNode getDeclaredOrInferredType(final Expression expression) {
+        ClassNode declaredOrInferred;
         // in case of "T t = new ExtendsOrImplementsT()", return T for the expression type
         if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {
-            return getOriginalDeclarationType(expression); // GROOVY-9996
+            declaredOrInferred = getOriginalDeclarationType(expression);
+        } else {
+            declaredOrInferred = getType(expression);
         }
-        return getInferredTypeFromTempInfo(expression, getType(expression));
+        return getInferredTypeFromTempInfo(expression, declaredOrInferred);
     }
     // GRECLIPSE end
 
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
@@ -5914,13 +5914,16 @@ private ClassNode resolveGenericsWithContext(final Map<GenericsTypeName, Generic
         return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);
     }
 
-    // GRECLIPSE add
+    // GRECLIPSE add -- GROOVY-9996, GROOVY-10011
     private ClassNode getDeclaredOrInferredType(final Expression expression) {
+        ClassNode declaredOrInferred;
         // in case of "T t = new ExtendsOrImplementsT()", return T for the expression type
         if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {
-            return getOriginalDeclarationType(expression); // GROOVY-9996
+            declaredOrInferred = getOriginalDeclarationType(expression);
+        } else {
+            declaredOrInferred = getType(expression);
         }
-        return getInferredTypeFromTempInfo(expression, getType(expression));
+        return getInferredTypeFromTempInfo(expression, declaredOrInferred);
     }
     // GRECLIPSE end
 
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
@@ -5862,13 +5862,16 @@ private ClassNode resolveGenericsWithContext(final Map<GenericsTypeName, Generic
         return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);
     }
 
-    // GRECLIPSE add
+    // GRECLIPSE add -- GROOVY-9996, GROOVY-10011
     private ClassNode getDeclaredOrInferredType(final Expression expression) {
+        ClassNode declaredOrInferred;
         // in case of "T t = new ExtendsOrImplementsT()", return T for the expression type
         if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {
-            return getOriginalDeclarationType(expression); // GROOVY-9996
+            declaredOrInferred = getOriginalDeclarationType(expression);
+        } else {
+            declaredOrInferred = getType(expression);
         }
-        return getInferredTypeFromTempInfo(expression, getType(expression));
+        return getInferredTypeFromTempInfo(expression, declaredOrInferred);
     }
     // GRECLIPSE end
 

Original file line number	Diff line number	Diff line change
`@@ -6147,13 +6147,16 @@ private ClassNode resolveGenericsWithContext(Map<GenericsTypeName, GenericsType>`
`6147`	`6147`	`return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);`
`6148`	`6148`	`}`
`6149`	`6149`
`6150`		`- // GRECLIPSE add`
	`6150`	`+ // GRECLIPSE add -- GROOVY-9996, GROOVY-10011`
`6151`	`6151`	`private ClassNode getDeclaredOrInferredType(final Expression expression) {`
	`6152`	`+ ClassNode declaredOrInferred;`
`6152`	`6153`	`// in case of "T t = new ExtendsOrImplementsT()", return T for the expression type`
`6153`	`6154`	`if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {`
`6154`		`- return getOriginalDeclarationType(expression); // GROOVY-9996`
	`6155`	`+ declaredOrInferred = getOriginalDeclarationType(expression);`
	`6156`	`+ } else {`
	`6157`	`+ declaredOrInferred = getType(expression);`
`6155`	`6158`	`}`
`6156`		`- return getInferredTypeFromTempInfo(expression, getType(expression));`
	`6159`	`+ return getInferredTypeFromTempInfo(expression, declaredOrInferred);`
`6157`	`6160`	`}`
`6158`	`6161`	`// GRECLIPSE end`
`6159`	`6162`
Original file line number	Diff line number	Diff line change
`@@ -5914,13 +5914,16 @@ private ClassNode resolveGenericsWithContext(final Map<GenericsTypeName, Generic`
`5914`	`5914`	`return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);`
`5915`	`5915`	`}`
`5916`	`5916`
`5917`		`- // GRECLIPSE add`
	`5917`	`+ // GRECLIPSE add -- GROOVY-9996, GROOVY-10011`
`5918`	`5918`	`private ClassNode getDeclaredOrInferredType(final Expression expression) {`
	`5919`	`+ ClassNode declaredOrInferred;`
`5919`	`5920`	`// in case of "T t = new ExtendsOrImplementsT()", return T for the expression type`
`5920`	`5921`	`if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {`
`5921`		`- return getOriginalDeclarationType(expression); // GROOVY-9996`
	`5922`	`+ declaredOrInferred = getOriginalDeclarationType(expression);`
	`5923`	`+ } else {`
	`5924`	`+ declaredOrInferred = getType(expression);`
`5922`	`5925`	`}`
`5923`		`- return getInferredTypeFromTempInfo(expression, getType(expression));`
	`5926`	`+ return getInferredTypeFromTempInfo(expression, declaredOrInferred);`
`5924`	`5927`	`}`
`5925`	`5928`	`// GRECLIPSE end`
`5926`	`5929`
Original file line number	Diff line number	Diff line change
`@@ -5862,13 +5862,16 @@ private ClassNode resolveGenericsWithContext(final Map<GenericsTypeName, Generic`
`5862`	`5862`	`return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);`
`5863`	`5863`	`}`
`5864`	`5864`
`5865`		`- // GRECLIPSE add`
	`5865`	`+ // GRECLIPSE add -- GROOVY-9996, GROOVY-10011`
`5866`	`5866`	`private ClassNode getDeclaredOrInferredType(final Expression expression) {`
	`5867`	`+ ClassNode declaredOrInferred;`
`5867`	`5868`	`// in case of "T t = new ExtendsOrImplementsT()", return T for the expression type`
`5868`	`5869`	`if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {`
`5869`		`- return getOriginalDeclarationType(expression); // GROOVY-9996`
	`5870`	`+ declaredOrInferred = getOriginalDeclarationType(expression);`
	`5871`	`+ } else {`
	`5872`	`+ declaredOrInferred = getType(expression);`
`5870`	`5873`	`}`
`5871`		`- return getInferredTypeFromTempInfo(expression, getType(expression));`
	`5874`	`+ return getInferredTypeFromTempInfo(expression, declaredOrInferred);`
`5872`	`5875`	`}`
`5873`	`5876`	`// GRECLIPSE end`
`5874`	`5877`