GROOVY-10011

Author: eric-milles

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, "");
+    }
 }

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
 

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
 

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