[GR-38094] Do not store record component accessors on the heap

PullRequest: graal/13399

Author: loicottet

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java

@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.function.Function;
 
+import com.oracle.svm.core.util.VMError;
 import org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -498,7 +499,6 @@ private static Target_java_lang_reflect_RecordComponent decodeRecordComponent(Un
         String name = decodeName(buf, info);
         Class<?> type = decodeType(buf, info);
         String signature = decodeName(buf, info);
-        Method accessor = (Method) decodeObject(buf, info);
         byte[] annotations = decodeByteArray(buf);
         byte[] typeAnnotations = decodeByteArray(buf);
 
@@ -507,7 +507,11 @@ private static Target_java_lang_reflect_RecordComponent decodeRecordComponent(Un
         recordComponent.name = name;
         recordComponent.type = type;
         recordComponent.signature = signature;
-        recordComponent.accessor = accessor;
+        try {
+            recordComponent.accessor = declaringClass.getDeclaredMethod(name);
+        } catch (NoSuchMethodException e) {
+            throw VMError.shouldNotReachHere("Record component accessors should have been registered by the analysis.");
+        }
         recordComponent.annotations = annotations;
         recordComponent.typeAnnotations = typeAnnotations;
         return recordComponent;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadata.java

@@ -213,15 +213,13 @@ static class RecordComponentMetadata extends AnnotatedElementMetadata {
         final String name;
         final HostedType type;
         final String signature;
-        final JavaConstant accessor;
 
-        RecordComponentMetadata(HostedType declaringType, String name, HostedType type, String signature, JavaConstant accessor, AnnotationValue[] annotations, TypeAnnotationValue[] typeAnnotations) {
+        RecordComponentMetadata(HostedType declaringType, String name, HostedType type, String signature, AnnotationValue[] annotations, TypeAnnotationValue[] typeAnnotations) {
             super(annotations, typeAnnotations);
             this.declaringType = declaringType;
             this.name = name;
             this.type = type;
             this.signature = signature;
-            this.accessor = accessor;
         }
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java

@@ -607,7 +607,6 @@ private RecordComponentMetadata[] getRecordComponents(MetaAccessProvider metaAcc
             String name = getRecordComponentName(recordComponent);
             HostedType type = (HostedType) metaAccess.lookupJavaType(getRecordComponentType(recordComponent));
             String signature = getRecordComponentSignature(recordComponent);
-            Method accessor = getRecordComponentAccessor(recordComponent);
 
             /* Fill encoders with the necessary values. */
             encoders.sourceMethodNames.addObject(name);
@@ -616,13 +615,8 @@ private RecordComponentMetadata[] getRecordComponents(MetaAccessProvider metaAcc
             /* Register string and class values in annotations */
             AnnotationValue[] annotations = registerAnnotationValues(recordComponent);
             TypeAnnotationValue[] typeAnnotations = registerTypeAnnotationValues(recordComponent);
-            JavaConstant accessorConstant = null;
-            if (accessor != null) {
-                accessorConstant = SubstrateObjectConstant.forObject(accessor);
-                encoders.objectConstants.addObject(accessorConstant);
-            }
 
-            metadata[i] = new RecordComponentMetadata(declaringType, name, type, signature, accessorConstant, annotations, typeAnnotations);
+            metadata[i] = new RecordComponentMetadata(declaringType, name, type, signature, annotations, typeAnnotations);
         }
         return metadata;
     }
@@ -640,7 +634,6 @@ private RecordComponentMetadata[] getRecordComponents(MetaAccessProvider metaAcc
     private static final Method getRecordComponentName = (JavaVersionUtil.JAVA_SPEC >= 17) ? ReflectionUtil.lookupMethod(recordComponentClass, "getName") : null;
     private static final Method getRecordComponentType = (JavaVersionUtil.JAVA_SPEC >= 17) ? ReflectionUtil.lookupMethod(recordComponentClass, "getType") : null;
     private static final Method getRecordComponentSignature = (JavaVersionUtil.JAVA_SPEC >= 17) ? ReflectionUtil.lookupMethod(recordComponentClass, "getGenericSignature") : null;
-    private static final Method getRecordComponentAccessor = (JavaVersionUtil.JAVA_SPEC >= 17) ? ReflectionUtil.lookupMethod(recordComponentClass, "getAccessor") : null;
 
     private static String getRecordComponentName(Object recordComponent) {
         try {
@@ -666,14 +659,6 @@ private static String getRecordComponentSignature(Object recordComponent) {
         }
     }
 
-    private static Method getRecordComponentAccessor(Object recordComponent) {
-        try {
-            return (Method) getRecordComponentAccessor.invoke(recordComponent);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw VMError.shouldNotReachHere(e);
-        }
-    }
-
     /**
      * See {@link ReflectionMetadataDecoderImpl} for the encoding format description.
      */
@@ -986,7 +971,6 @@ private void encodeRecordComponent(UnsafeArrayTypeWriter buf, RecordComponentMet
         encodeName(buf, recordComponent.name);
         encodeType(buf, recordComponent.type);
         encodeName(buf, recordComponent.signature);
-        encodeObject(buf, recordComponent.accessor);
         encodeByteArray(buf, encodeAnnotations(recordComponent.annotations));
         encodeByteArray(buf, encodeTypeAnnotations(recordComponent.typeAnnotations));
     }