GROOVY-9790

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java

@@ -25,7 +25,6 @@
 import java.io.File;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import org.codehaus.jdt.groovy.internal.compiler.ast.EventListener;
 import org.codehaus.jdt.groovy.internal.compiler.ast.GroovyClassScope;
@@ -598,28 +597,6 @@ public void testLambdaScope2() {
         runConformTest(sources, "0f1f2f3f4f");
     }
 
-    @Test // GROOVY-9790
-    public void testLambdaTypes1() {
-        assumeTrue(isParrotParser());
-
-        for (Object sig : Stream.of("i", "(int i)", "(Integer i)").skip(isAtLeastGroovy(40) ? 0 : 1).toArray()) { // bare name not supported until Groovy 3.0.10
-            //@formatter:off
-            String[] sources = {
-                "Script.groovy",
-                "@groovy.transform.CompileStatic\n" +
-                "void test() {\n" +
-                "  java.util.stream.IntStream.range(0, 2).forEach(\n" +
-                "    " + sig + " -> { assert i >= 0 && i < 2 }\n" +
-                "  )\n" +
-                "}\n" +
-                "test()\n",
-            };
-            //@formatter:on
-
-            runConformTest(sources);
-        }
-    }
-
     @Test
     public void testMultiCatch() {
         //@formatter:off

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

@@ -6158,6 +6158,28 @@ public void testCompileStatic9786() {
         runConformTest(sources, "B");
     }
 
+    @Test
+    public void testCompileStatic9790() {
+        assumeTrue(isParrotParser());
+
+        for (Object sig : new String[] {"i", "(int i)", "(Integer i)"}) {
+            //@formatter:off
+            String[] sources = {
+                "Script.groovy",
+                "@groovy.transform.CompileStatic\n" +
+                "void test() {\n" +
+                "  java.util.stream.IntStream.range(0, 2).forEach(\n" +
+                "    " + sig + " -> { assert i >= 0 && i < 2 }\n" +
+                "  )\n" +
+                "}\n" +
+                "test()\n",
+            };
+            //@formatter:on
+
+            runConformTest(sources);
+        }
+    }
+
     @Test
     public void testCompileStatic9799() {
         assumeTrue(isParrotParser());

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

@@ -3358,8 +3358,16 @@ protected void inferClosureParameterTypes(final ClassNode receiver, final Expres
                     paramTypes = samParamTypes;
                 } else {
                     paramTypes = new ClassNode[n];
-                    for (int i = 0; i < n; i += 1) {
-                        paramTypes[i] = !p[i].isDynamicTyped() ? p[i].getOriginType() : (i < samParamTypes.length ? samParamTypes[i] : null);
+                    for (int i = 0; i < n && i < samParamTypes.length; i += 1) {
+                        if (p[i].isDynamicTyped()) {
+                            paramTypes[i] = samParamTypes[i];
+                        } else {
+                            ClassNode declared = p[i].getOriginType(), inferred = samParamTypes[i];
+                            if (isPrimitiveType(inferred) && getWrapper(inferred).equals(declared))
+                                paramTypes[i] = inferred; // GROOVY-9790
+                            else
+                                paramTypes[i] = declared;
+                        }
                     }
                 }
                 expression.putNodeMetaData(CLOSURE_ARGUMENTS, paramTypes);