GROOVY-9970

groovy · Mar 8, 2021 · 06f7e59 · 06f7e59
1 parent a7a9911
commit 06f7e59
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 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
@@ -1115,4 +1115,32 @@ public void testTypeChecked9968() {
 
         runConformTest(sources, "[x, y, z][x, y, z]");
     }
+
+    @Test
+    public void testTypeChecked9970() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TupleConstructor\n" +
+            "class A<T extends B> {\n" +
+            "  T p\n" +
+            "}\n" +
+            "class B {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "class C<T extends Number> {\n" +
+            "  void test(T n) {\n" +
+            "    A<B> x = new A<>(new B())\n" +
+            "    def closure = { ->\n" +
+            "      A<B> y = new A<>(new B())\n" +
+            "    }\n" +
+            "    closure.call()\n" +
+            "  }\n" +
+            "}\n" +
+            "new C<Long>().test(42L)\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "");
+    }
 }
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
@@ -5518,13 +5518,10 @@ protected ClassNode inferReturnTypeGenerics(
         if (resolvedPlaceholders.isEmpty()) {
             return boundUnboundedWildcards(returnType);
         }
-        /* GRECLIPSE edit -- GROOVY-9570
+        /* GRECLIPSE edit -- GROOVY-9570, GROOVY-9735, GROOVY-9970
         Map<GenericsTypeName, GenericsType> placeholdersFromContext = extractGenericsParameterMapOfThis(typeCheckingContext.getEnclosingMethod());
-        */
-        Map<GenericsTypeName, GenericsType> placeholdersFromContext = extractGenericsParameterMapOfThis(typeCheckingContext);
-        // GRECLIPSE end
         applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
-
+        */
         // then resolve receivers from method arguments
         Parameter[] parameters = method.getParameters();
         boolean isVargs = isVargs(parameters);
@@ -5570,13 +5567,12 @@ protected ClassNode inferReturnTypeGenerics(
                     extractGenericsConnections(connections, actualType, type);
                     extractGenericsConnectionsForSuperClassAndInterfaces(resolvedPlaceholders, connections);
                     applyGenericsConnections(connections, resolvedPlaceholders);
-                    // GRECLIPSE add -- GROOVY-9735
-                    applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
-                    // GRECLIPSE end
                 }
             }
         }
-
+        // GRECLIPSE add -- GROOVY-9570, GROOVY-9735, GROOVY-9970
+        applyGenericsConnections(extractGenericsParameterMapOfThis(typeCheckingContext), resolvedPlaceholders);
+        // GRECLIPSE end
         return applyGenericsContext(resolvedPlaceholders, returnType);
     }
 

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
@@ -5298,8 +5298,9 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
             return boundUnboundedWildcards(returnType);
         }
         Map<GenericsTypeName, GenericsType> placeholdersFromContext = extractGenericsParameterMapOfThis(typeCheckingContext);
+        /* GRECLIPSE edit -- GROOVY-9970
         applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
-
+        */
         // then resolve receivers from method arguments
         List<Expression> expressions = InvocationWriter.makeArgumentList(arguments).getExpressions();
         Parameter[] parameters = method.getParameters();
@@ -5344,11 +5345,15 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
                     extractGenericsConnectionsForSuperClassAndInterfaces(resolvedPlaceholders, connections);
 
                     applyGenericsConnections(connections, resolvedPlaceholders);
+                    /* GRECLIPSE edit -- GROOVY-9970
                     applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
+                    */
                 }
             }
         }
-
+        // GRECLIPSE add -- GROOVY-9970
+        applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
+        // GRECLIPSE end
         return applyGenericsContext(resolvedPlaceholders, returnType);
     }
 

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
@@ -5264,8 +5264,9 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
             return boundUnboundedWildcards(returnType);
         }
         Map<GenericsTypeName, GenericsType> placeholdersFromContext = extractGenericsParameterMapOfThis(typeCheckingContext);
+        /* GRECLIPSE edit -- GROOVY-9970
         applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
-
+        */
         // then resolve receivers from method arguments
         List<Expression> expressions = InvocationWriter.makeArgumentList(arguments).getExpressions();
         Parameter[] parameters = method.getParameters();
@@ -5302,11 +5303,15 @@ protected ClassNode inferReturnTypeGenerics(final ClassNode receiver, final Meth
                     extractGenericsConnectionsForSuperClassAndInterfaces(resolvedPlaceholders, connections);
 
                     applyGenericsConnections(connections, resolvedPlaceholders);
+                    /* GRECLIPSE edit -- GROOVY-9970
                     applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
+                    */
                 }
             }
         }
-
+        // GRECLIPSE add -- GROOVY-9970
+        applyGenericsConnections(placeholdersFromContext, resolvedPlaceholders);
+        // GRECLIPSE end
         return applyGenericsContext(resolvedPlaceholders, returnType);
     }