GROOVY-10339

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -4563,4 +4563,29 @@ public void testTypeChecked10336() {
             "Groovy:The argument is a method reference, but the parameter type is not a functional interface\n" +
             "----------\n");
     }
+
+    @Test
+    public void testTypeChecked10339() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "def <T> T bar(T x, T y) {\n" +
+            "}\n" +
+            "String foo() {\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  Integer i = bar(foo(), 1)\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 7)\n" +
+            "\tInteger i = bar(foo(), 1)\n" +
+            "\t            ^^^^^^^^^^^^^\n" +
+            "Groovy:[Static type checking] - Cannot assign value of type java.io.Serializable<? extends java.io.Serializable<java.lang.String>> to variable of type java.lang.Integer\n" +
+            "----------\n");
+    }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -6365,7 +6365,11 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume
                         Map<GenericsTypeName, GenericsType> connections = new HashMap<>();
                         extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);
                         connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {
-                            return gt2; // TODO
+                            // GRECLIPSE edit -- GROOVY-10339: incorporate additional witness
+                            ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);
+                            ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);
+                            return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];
+                            // GRECLIPSE end
                         }));
                     }
                 }

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -6035,7 +6035,11 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume
                         Map<GenericsTypeName, GenericsType> connections = new HashMap<>();
                         extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);
                         connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {
-                            return gt2; // TODO
+                            // GRECLIPSE edit -- GROOVY-10339: incorporate additional witness
+                            ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);
+                            ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);
+                            return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];
+                            // GRECLIPSE end
                         }));
                     }
                 }

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -5487,7 +5487,10 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume
                         Map<GenericsTypeName, GenericsType> connections = new HashMap<>();
                         extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);
                         connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {
-                            return gt2; // TODO
+                            // GROOVY-10339: incorporate additional witness
+                            ClassNode cn1 = makeClassSafe0(CLASS_Type, gt1);
+                            ClassNode cn2 = makeClassSafe0(CLASS_Type, gt2);
+                            return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];
                         }));
                     }
                 }