GROOVY-6938

groovy · Feb 24, 2021 · 625858c · 625858c
1 parent 96a22f3
commit 625858c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 6 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
@@ -293,6 +293,47 @@ public void testTypeChecked6882() {
         runConformTest(sources, "CC");
     }
 
+    @Test
+    public void testTypeChecked6938() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import groovy.transform.ASTTest\n" +
+            "import groovy.transform.TypeChecked\n" +
+            "import org.codehaus.groovy.ast.expr.MethodCallExpression\n" +
+            "import static org.codehaus.groovy.transform.stc.StaticTypesMarker.INFERRED_TYPE\n" +
+
+            "@TypeChecked\n" +
+            "class G extends J<Integer> {\n" +
+            "  Integer doSomething() {\n" +
+            "    @ASTTest(phase=CLASS_GENERATION, value={\n" +
+            "      def expr = node.rightExpression\n" +
+            "      assert expr instanceof MethodCallExpression\n" +
+            "      assert expr.objectExpression.text == 'super'\n" +
+
+            "      def type = expr.objectExpression.getNodeMetaData(INFERRED_TYPE)\n" +
+            "      assert type.toString(false) == 'J <Integer>'\n" + // was "J<T>"
+            "      type = node.leftExpression.getNodeMetaData(INFERRED_TYPE)\n" +
+            "      assert type.toString(false) == 'java.lang.Integer'\n" +
+            "    })\n" +
+            "    def result = super.doSomething()\n" +
+            "    return result\n" +
+            "  }\n" +
+            "}\n" +
+            "print new G().doSomething()\n",
+
+            "J.java",
+            "public class J <T extends Number> {\n" +
+            "  public T doSomething() {\n" +
+            "    return null;\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "null");
+    }
+
     @Test
     public void testTypeChecked7333() {
         //@formatter:off

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
@@ -5318,8 +5318,8 @@ private ClassNode getTypeFromClosureArguments(Parameter parameter, TypeCheckingC
         return null;
     }
 
-    private ClassNode makeSuper() {
-        return makeType(typeCheckingContext.getEnclosingClassNode().getSuperClass(), typeCheckingContext.isInStaticContext);
+    private ClassNode makeSuper() { // GRECLIPSE edit -- GROOVY-6938
+        return makeType(typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass(), typeCheckingContext.isInStaticContext);
     }
 
     private ClassNode makeThis() {

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
@@ -5098,8 +5098,8 @@ private static ClassNode makeSelf(final ClassNode trait) {
         return selfType;
     }
 
-    private ClassNode makeSuper() {
-        return makeType(typeCheckingContext.getEnclosingClassNode().getSuperClass(), typeCheckingContext.isInStaticContext);
+    private ClassNode makeSuper() { // GRECLIPSE edit -- GROOVY-6938
+        return makeType(typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass(), typeCheckingContext.isInStaticContext);
     }
 
     private ClassNode makeThis() {

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
@@ -5064,8 +5064,8 @@ private static ClassNode makeSelf(final ClassNode trait) {
         return selfType;
     }
 
-    private ClassNode makeSuper() {
-        return makeType(typeCheckingContext.getEnclosingClassNode().getSuperClass(), typeCheckingContext.isInStaticContext);
+    private ClassNode makeSuper() { // GRECLIPSE edit -- GROOVY-6938
+        return makeType(typeCheckingContext.getEnclosingClassNode().getUnresolvedSuperClass(), typeCheckingContext.isInStaticContext);
     }
 
     private ClassNode makeThis() {