GROOVY-7945

eric-milles · eric-milles · commit 91c08da96e1c · 2021-03-17T22:17:38.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
@@ -403,6 +403,37 @@ public void testTypeChecked7363() {
         runNegativeTest(sources, "");
     }
 
+    @Test
+    public void testTypeChecked7945() {
+        //@formatter:off
+        String[] sources = {
+            "Test.groovy",
+            "abstract class A<X, Y> {\n" +
+            "  private final Class<X> x\n" +
+            "  private final Class<Y> y\n" +
+            "  A(Class<X> x, Class<Y> y) {\n" +
+            "    this.x = x\n" +
+            "    this.y = y\n" +
+            "  }\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "class C extends A<String, Integer> {\n" +
+            "  C() {\n" +
+            "    super(Integer, String)\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Test.groovy (at line 12)\n" +
+            "\tsuper(Integer, String)\n" +
+            "\t^^^^^^^^^^^^^^^^^^^^^^\n" +
+            "Groovy:[Static type checking] - Cannot call A <String, Integer>#<init>(java.lang.Class <String>, java.lang.Class <Integer>) with arguments [java.lang.Class <java.lang.Integer>, java.lang.Class <java.lang.String>] \n" +
+            "----------\n");
+    }
+
     @Test
     public void testTypeChecked8103() {
         //@formatter:off
@@ -417,7 +448,7 @@ public void testTypeChecked8103() {
             "  fluent(Util.factory('{}')).isSimilarTo('{\"key\":\"val\"}')\n" + // STC error
             "}\n",
 
-            "API.groovy",
+            "Types.groovy",
             "class Fluent {\n" +
             "  static FluentAPI  fluent(String s) { return new FluentAPI() }\n" +
             "  static <T extends FluentExtension> T fluent(T t) { return t }\n" +
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
@@ -2511,7 +2511,11 @@ public void visitConstructorCallExpression(ConstructorCallExpression call) {
             if (call.isThisCall()) {
                 receiver = typeCheckingContext.getEnclosingClassNode();
             } else if (call.isSuperCall()) {
+                /* GRECLIPSE edit -- GROVY-7945
                 receiver = typeCheckingContext.getEnclosingClassNode().getSuperClass();
+                */
+                receiver = typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass();
+                // GRECLIPSE end
             }
             Expression arguments = call.getArguments();
             ArgumentListExpression argumentList = InvocationWriter.makeArgumentList(arguments);
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
@@ -2312,7 +2312,11 @@ public void visitConstructorCallExpression(final ConstructorCallExpression call)
         if (call.isThisCall()) {
             receiver = typeCheckingContext.getEnclosingClassNode();
         } else if (call.isSuperCall()) {
+            /* GRECLIPSE edit -- GROVY-7945
             receiver = typeCheckingContext.getEnclosingClassNode().getSuperClass();
+            */
+            receiver = typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass();
+            // GRECLIPSE end
         }
         Expression arguments = call.getArguments();
         ArgumentListExpression argumentList = InvocationWriter.makeArgumentList(arguments);
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
@@ -2299,7 +2299,11 @@ public void visitConstructorCallExpression(final ConstructorCallExpression call)
         if (call.isThisCall()) {
             receiver = typeCheckingContext.getEnclosingClassNode();
         } else if (call.isSuperCall()) {
+            /* GRECLIPSE edit -- GROVY-7945
             receiver = typeCheckingContext.getEnclosingClassNode().getSuperClass();
+            */
+            receiver = typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass();
+            // GRECLIPSE end
         }
         Expression arguments = call.getArguments();
         ArgumentListExpression argumentList = InvocationWriter.makeArgumentList(arguments);
