GROOVY-10339

eric-milles · eric-milles · commit d51ff5262ef3 · 2021-11-02T16:56:04.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
@@ -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");
+    }
 }
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
@@ -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
                         }));
                     }
                 }
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
@@ -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
                         }));
                     }
                 }
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
@@ -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];
                         }));
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -6365,7 +6365,11 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume`
`6365`	`6365`	`Map<GenericsTypeName, GenericsType> connections = new HashMap<>();`
`6366`	`6366`	`extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);`
`6367`	`6367`	`connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {`
`6368`		`- return gt2; // TODO`
	`6368`	`+ // GRECLIPSE edit -- GROOVY-10339: incorporate additional witness`
	`6369`	`+ ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);`
	`6370`	`+ ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);`
	`6371`	`+ return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];`
	`6372`	`+ // GRECLIPSE end`
`6369`	`6373`	`}));`
`6370`	`6374`	`}`
`6371`	`6375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6035,7 +6035,11 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume`
`6035`	`6035`	`Map<GenericsTypeName, GenericsType> connections = new HashMap<>();`
`6036`	`6036`	`extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);`
`6037`	`6037`	`connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {`
`6038`		`- return gt2; // TODO`
	`6038`	`+ // GRECLIPSE edit -- GROOVY-10339: incorporate additional witness`
	`6039`	`+ ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);`
	`6040`	`+ ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);`
	`6041`	`+ return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];`
	`6042`	`+ // GRECLIPSE end`
`6039`	`6043`	`}));`
`6040`	`6044`	`}`
`6041`	`6045`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5487,7 +5487,10 @@ private Map<GenericsTypeName, GenericsType> extractGenericsConnectionsFromArgume`
`5487`	`5487`	`Map<GenericsTypeName, GenericsType> connections = new HashMap<>();`
`5488`	`5488`	`extractGenericsConnections(connections, wrapTypeIfNecessary(argumentType), paramType);`
`5489`	`5489`	`connections.forEach((gtn, gt) -> resolvedPlaceholders.merge(gtn, gt, (gt1, gt2) -> {`
`5490`		`- return gt2; // TODO`
	`5490`	`+ // GROOVY-10339: incorporate additional witness`
	`5491`	`+ ClassNode cn1 = makeClassSafe0(CLASS_Type, gt1);`
	`5492`	`+ ClassNode cn2 = makeClassSafe0(CLASS_Type, gt2);`
	`5493`	`+ return lowestUpperBound(cn1,cn2).getGenericsTypes()[0];`
`5491`	`5494`	`}));`
`5492`	`5495`	`}`
`5493`	`5496`	`}`