GROOVY-11363: SC: support primitiveValue::boxedClassMethod

apache · Apr 24, 2024 · 6ced541 · 6ced541
1 parent bc26ebc
commit 6ced541
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.../java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java b/.../java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
@@ -89,6 +89,9 @@ public void writeMethodReferenceExpression(final MethodReferenceExpression metho
         ClassNode typeOrTargetRefType = isClassExpression ? typeOrTargetRef.getType()
                 : controller.getTypeChooser().resolveType(typeOrTargetRef, classNode);
 
+        if (ClassHelper.isPrimitiveType(typeOrTargetRefType)) // GROOVY-11353
+            typeOrTargetRefType = ClassHelper.getWrapper(typeOrTargetRefType);
+
         ClassNode[] methodReferenceParamTypes = methodReferenceExpression.getNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS);
         Parameter[] parametersWithExactType = createParametersWithExactType(abstractMethod, methodReferenceParamTypes);
         String methodRefName = methodReferenceExpression.getMethodName().getText();
@@ -126,6 +129,7 @@ public void writeMethodReferenceExpression(final MethodReferenceExpression metho
                 isClassExpression = true;
             } else {
                 typeOrTargetRef.visit(controller.getAcg());
+                controller.getOperandStack().box(); // GROOVY-11353
             }
         }
 

diff --git a/src/test/groovy/transform/stc/MethodReferenceTest.groovy b/src/test/groovy/transform/stc/MethodReferenceTest.groovy
@@ -1312,7 +1312,7 @@ final class MethodReferenceTest {
         '''
     }
 
-    @Test // GROOVY-10813
+    @Test // GROOVY-10813, GROOVY-11363
     void testMethodSelection2() {
         for (spec in ['', '<?>', '<Object>', '<? extends Object>', '<? super String>']) {
             assertScript imports + """
@@ -1353,6 +1353,16 @@ final class MethodReferenceTest {
                 assert result == 'x'
             }
 
+            test()
+        '''
+        assertScript imports + '''
+            @CompileStatic
+            void test() {
+                Supplier<String> s = 0::toString
+                def result = s.get()
+                assert result == '0'
+            }
+
             test()
         '''
     }