GROOVY-10128, GROOVY-10306

Author: eric-milles

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

@@ -3714,6 +3714,25 @@ public void testTypeChecked10111a() {
         runConformTest(sources);
     }
 
+    @Test
+    public void testTypeChecked10128() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  java.util.function.Function<String, Number> x = { s ->\n" +
+            "    long n = 1\n" +
+            "    return n\n" +
+            "  }\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testTypeChecked10166() {
         //@formatter:off
@@ -4152,6 +4171,30 @@ public void testTypeChecked10295() {
         runConformTest(sources);
     }
 
+    @Test
+    public void testTypeChecked10306() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class Main {\n" +
+            "  byte p = 1\n" +
+            "  @groovy.transform.TypeChecked\n" +
+            "  def test() {\n" +
+            "    byte v = 1\n" +
+            "    java.util.function.Supplier<Number> s1 = { -> v }\n" +
+            "    java.util.function.Supplier<Number> s2 = { -> p }\n" +
+            "  }\n" +
+            "  static main(args) {\n" +
+            "    def self = this.newInstance()\n" +
+            "    print(self.test().get())\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "1");
+    }
+
     @Test
     public void testTypeChecked10320() {
         //@formatter:off

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

@@ -2746,7 +2746,7 @@ protected ClassNode checkReturnType(final ReturnStatement statement) {
             if (STRING_TYPE.equals(inferredReturnType) && StaticTypeCheckingSupport.isGStringOrGStringStringLUB(type)) {
                 type = STRING_TYPE; // implicit "toString()" before return
             } else if (inferredReturnType != null && !GenericsUtils.hasUnresolvedGenerics(inferredReturnType)
-                    && GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(type)) {
+                    && GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(wrapTypeIfNecessary(type))) {
                 type = inferredReturnType; // allow simple covariance
             }
             return type;

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

@@ -2485,7 +2485,7 @@ protected ClassNode checkReturnType(final ReturnStatement statement) {
             }
             // GRECLIPSE add
             else if (inferredReturnType != null && !GenericsUtils.hasUnresolvedGenerics(inferredReturnType)
-                    && GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(type)) {
+                    && GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(wrapTypeIfNecessary(type))) {
                 type = inferredReturnType; // allow simple covariance
             }
             // GRECLIPSE end

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

@@ -2262,8 +2262,8 @@ protected ClassNode checkReturnType(final ReturnStatement statement) {
                 type = STRING_TYPE; // GROOVY-9971: convert GString to String at point of return
             } else if (inferredReturnType != null
                     && !GenericsUtils.hasUnresolvedGenerics(inferredReturnType)
-                    &&  GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(type)) {
-                type = inferredReturnType; // GROOVY-8310, GROOVY-10082, GROOVY-10091: allow simple covariance
+                    &&  GenericsUtils.buildWildcardType(inferredReturnType).isCompatibleWith(wrapTypeIfNecessary(type))) {
+                type = inferredReturnType; // GROOVY-8310, GROOVY-10082, GROOVY-10091, GROOVY-10128, GROOVY-10306: allow simple covariance
             }
             return type;
         }