GROOVY-11993: Support serializable method reference (#2514)

Author: daniellansun

src/main/java/org/codehaus/groovy/classgen/asm/sc/AbstractFunctionalInterfaceWriter.java

@@ -0,0 +1,52 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.codehaus.groovy.classgen.asm.sc;
+
+/**
+ * Internal AST node metadata keys used by the statically-compiled lambda and method-reference pipeline.
+ *
+ * @since 6.0.0
+ */
+enum StaticTypesFunctionalInterfaceMetadataKey {
+    /**
+     * Stores the shared {@code $deserializeLambda$} guard block on the enclosing class node.
+     */
+    DESERIALIZE_LAMBDA_DISPATCHER,
+    /**
+     * Marks the synthetic constructor created for a generated lambda class.
+     */
+    LAMBDA_GENERATED_CONSTRUCTOR,
+    /**
+     * Stores the captured shared variables prepared for a lambda expression.
+     */
+    LAMBDA_SHARED_VARIABLES,
+    /**
+     * Marks the deserialize helper method that preloads a captured lambda receiver.
+     */
+    LAMBDA_PRELOADED_RECEIVER,
+    /**
+     * Caches whether the analyzed lambda method touches enclosing-instance state.
+     */
+    LAMBDA_ACCESSES_INSTANCE_MEMBERS,
+    /**
+     * Stores the synthetic deserialize helper name allocated for a method-reference expression so
+     * repeated bytecode-generation visits can reuse the same helper slot.
+     */
+    METHOD_REFERENCE_DESERIALIZE_METHOD_NAME
+}

src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesFunctionalInterfaceMetadataKey.java

@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.codehaus.groovy.classgen.asm.sc.StaticTypesFunctionalInterfaceMetadataKey.LAMBDA_ACCESSES_INSTANCE_MEMBERS;
 import static org.apache.groovy.util.BeanUtils.capitalize;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
 import static org.codehaus.groovy.transform.stc.StaticTypesMarker.DIRECT_METHOD_CALL_TARGET;
@@ -68,14 +69,14 @@ boolean isNonCapturing(final MethodNode lambdaMethod, final Parameter[] sharedVa
     }
 
     boolean accessesInstanceMembers(final MethodNode lambdaMethod) {
-        Boolean accessingInstanceMembers = lambdaMethod.getNodeMetaData(MetaDataKey.ACCESSES_INSTANCE_MEMBERS);
+        Boolean accessingInstanceMembers = lambdaMethod.getNodeMetaData(LAMBDA_ACCESSES_INSTANCE_MEMBERS);
         if (accessingInstanceMembers != null) return accessingInstanceMembers;
 
         InstanceMemberAccessFinder finder = new InstanceMemberAccessFinder(getOrCreateResolver(lambdaMethod));
         lambdaMethod.getCode().visit(finder);
 
         accessingInstanceMembers = finder.isAccessingInstanceMembers();
-        lambdaMethod.putNodeMetaData(MetaDataKey.ACCESSES_INSTANCE_MEMBERS, accessingInstanceMembers);
+        lambdaMethod.putNodeMetaData(LAMBDA_ACCESSES_INSTANCE_MEMBERS, accessingInstanceMembers);
         return accessingInstanceMembers;
     }
 
@@ -161,9 +162,7 @@ private Expression qualify(final VariableExpression expression) {
 
             PropertyExpression qualifiedReference = new PropertyExpression(classX(owner), expression.getName());
             qualifiedReference.setImplicitThis(false);
-            qualifiedReference.copyNodeMetaData(expression);
-            setSourcePosition(qualifiedReference, expression);
-            return qualifiedReference;
+            return finishQualifiedReference(qualifiedReference, expression);
         }
 
         private Expression qualify(final AttributeExpression expression) {
@@ -177,9 +176,7 @@ private Expression qualify(final AttributeExpression expression) {
             );
             qualifiedReference.setImplicitThis(false);
             qualifiedReference.setSpreadSafe(expression.isSpreadSafe());
-            qualifiedReference.copyNodeMetaData(expression);
-            setSourcePosition(qualifiedReference, expression);
-            return qualifiedReference;
+            return finishQualifiedReference(qualifiedReference, expression);
         }
 
         private Expression qualify(final PropertyExpression expression) {
@@ -193,9 +190,7 @@ private Expression qualify(final PropertyExpression expression) {
             );
             qualifiedReference.setImplicitThis(false);
             qualifiedReference.setSpreadSafe(expression.isSpreadSafe());
-            qualifiedReference.copyNodeMetaData(expression);
-            setSourcePosition(qualifiedReference, expression);
-            return qualifiedReference;
+            return finishQualifiedReference(qualifiedReference, expression);
         }
 
         private Expression qualify(final MethodCallExpression expression) {
@@ -212,6 +207,10 @@ private Expression qualify(final MethodCallExpression expression) {
             qualifiedReference.setSpreadSafe(expression.isSpreadSafe());
             qualifiedReference.setGenericsTypes(expression.getGenericsTypes());
             qualifiedReference.setMethodTarget(expression.getMethodTarget());
+            return finishQualifiedReference(qualifiedReference, expression);
+        }
+
+        private <T extends Expression> T finishQualifiedReference(final T qualifiedReference, final Expression expression) {
             qualifiedReference.copyNodeMetaData(expression);
             setSourcePosition(qualifiedReference, expression);
             return qualifiedReference;
@@ -394,10 +393,6 @@ private boolean isAccessingInstanceMembers() {
         }
     }
 
-    private enum MetaDataKey {
-        ACCESSES_INSTANCE_MEMBERS
-    }
-
     private final SourceUnit sourceUnit;
     private final Map<MethodNode, OuterStaticMemberResolver> resolverCache = new HashMap<>();
 }