[GR-60116] Persist metadata of AOT types during build-time for Crema

PullRequest: graal/19798

Author: lewurm

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java

@@ -131,6 +131,7 @@ public CodePointer getCodeStart() {
         return codeStart;
     }
 
+    @Platforms(Platform.HOSTED_ONLY.class)
     public HostedImageCodeInfo getHostedImageCodeInfo() {
         return hostedImageCodeInfo;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java

@@ -34,6 +34,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
 import com.oracle.svm.core.option.AccumulatingLocatableMultiOptionValue;
 import com.oracle.svm.core.option.BundleMember;
 import com.oracle.svm.core.option.HostedOptionKey;
@@ -213,6 +216,7 @@ public static List<URL> findConfigurationResources(String fileName, ClassLoader
         return resources;
     }
 
+    @Platforms(Platform.HOSTED_ONLY.class)
     private static UserError.UserException foundLockFile(String container) {
         throw UserError.abort("%s contains file '%s', which means an agent is currently writing to it." +
                         "The agent must finish execution before its generated configuration can be used to build a native image." +

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/CremaSupport.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.hub;
+
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+public interface CremaSupport {
+    ResolvedJavaType createInterpreterType(DynamicHub hub, ResolvedJavaType analysisType);
+}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -143,6 +143,7 @@
 import jdk.internal.reflect.FieldAccessor;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.reflect.ReflectionFactory;
+import jdk.vm.ci.meta.ResolvedJavaType;
 import sun.reflect.annotation.AnnotationType;
 import sun.reflect.generics.factory.GenericsFactory;
 import sun.reflect.generics.repository.ClassRepository;
@@ -435,7 +436,11 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
         // GR-59683
         Module module = null;
 
-        DynamicHubCompanion companion = DynamicHubCompanion.createAtRuntime(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        // GR-59683: Setup interpreter metadata at run-time.
+        ResolvedJavaType interpreterType = null;
+
+        DynamicHubCompanion companion = DynamicHubCompanion.createAtRuntime(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature,
+                        interpreterType);
 
         /* Always allow unsafe allocation for classes that were loaded at run-time. */
         companion.canUnsafeAllocate = true;
@@ -461,6 +466,8 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
         companion.enumConstantsReference = null;
 
         /*
+         * GR-61330:
+         *
          * These are read in snippets and must also not be set directly or the analysis would not
          * consider them to be immutable:
          *
@@ -470,12 +477,12 @@ public static DynamicHub allocate(String name, DynamicHub superHub, DynamicHub c
          * NumUtil.safeToUByte(makeFlag(ADDITIONAL_FLAGS_INSTANTIATED_BIT, true));
          */
 
+        // GR-61330: only write if the field exists according to analysis
+        // companion.metaType = null;
+
         // GR-60080: Proper referenceMap needed.
         int referenceMapIndex = DynamicHub.fromClass(Object.class).referenceMapIndex;
 
-        // GR-59683: Maybe can be used to inject a backreference to InterpreterResolvedObjectType
-        companion.metaType = null;
-
         // GR-57813
         companion.hubMetadata = null;
         companion.reflectionMetadata = null;
@@ -743,6 +750,14 @@ public SharedType getMetaType() {
         return companion.metaType;
     }
 
+    public ResolvedJavaType getInterpreterType() {
+        return companion.interpreterType;
+    }
+
+    public void setInterpreterType(ResolvedJavaType interpreterType) {
+        companion.interpreterType = interpreterType;
+    }
+
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public String getSourceFileName() {
         return companion.sourceFileName;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubCompanion.java

@@ -39,6 +39,7 @@
 import com.oracle.svm.core.meta.SharedType;
 
 import jdk.internal.vm.annotation.Stable;
+import jdk.vm.ci.meta.ResolvedJavaType;
 import sun.reflect.annotation.AnnotationType;
 import sun.reflect.generics.repository.ClassRepository;
 
@@ -128,6 +129,7 @@ public final class DynamicHubCompanion {
      * {@link DynamicHub#NO_CLASS_LOADER}.
      */
     Object classLoader;
+    ResolvedJavaType interpreterType;
 
     String packageName;
     ProtectionDomain protectionDomain;
@@ -143,17 +145,18 @@ public final class DynamicHubCompanion {
     static DynamicHubCompanion createHosted(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
                     Object classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
 
-        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature, null);
     }
 
     static DynamicHubCompanion createAtRuntime(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
-                    ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
+                    ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature,
+                    ResolvedJavaType interpreterType) {
         assert RuntimeClassLoading.isSupported();
-        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature, interpreterType);
     }
 
     private DynamicHubCompanion(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
-                    Object classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
+                    Object classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature, ResolvedJavaType interpreterType) {
         this.module = module;
         this.superHub = superHub;
         this.sourceFileName = sourceFileName;
@@ -164,5 +167,6 @@ private DynamicHubCompanion(Module module, DynamicHub superHub, String sourceFil
         this.signature = signature;
 
         this.classLoader = classLoader;
+        this.interpreterType = interpreterType;
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/RuntimeClassLoading.java

@@ -27,6 +27,7 @@
 import static jdk.graal.compiler.options.OptionStability.EXPERIMENTAL;
 
 import org.graalvm.collections.EconomicMap;
+import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.HostedOptionKey;
@@ -36,6 +37,7 @@
 import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionKey;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 public class RuntimeClassLoading {
     public static final class Options {
@@ -64,4 +66,8 @@ private static void validate(HostedOptionKey<Boolean> optionKey) {
     public static boolean isSupported() {
         return Options.SupportRuntimeClassLoading.getValue();
     }
+
+    public static ResolvedJavaType createInterpreterType(DynamicHub hub, ResolvedJavaType analysisType) {
+        return ImageSingletons.lookup(CremaSupport.class).createInterpreterType(hub, analysisType);
+    }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java

@@ -45,6 +45,7 @@
 import com.oracle.svm.core.classinitialization.ClassInitializationInfo;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.DynamicHubCompanion;
+import com.oracle.svm.core.hub.RuntimeClassLoading;
 import com.oracle.svm.core.meta.MethodPointer;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.BootLoaderSupport;
@@ -75,6 +76,7 @@ public class DynamicHubInitializer {
     private final Field hubCompanionClassInitializationInfo;
     private final Field hubCompanionInterfacesEncoding;
     private final Field hubCompanionAnnotationsEnumConstantsReference;
+    private final Field hubCompanionInterpreterType;
 
     public DynamicHubInitializer(BigBang bb) {
         this.bb = bb;
@@ -88,6 +90,7 @@ public DynamicHubInitializer(BigBang bb) {
         hubCompanionClassInitializationInfo = ReflectionUtil.lookupField(DynamicHubCompanion.class, "classInitializationInfo");
         hubCompanionInterfacesEncoding = ReflectionUtil.lookupField(DynamicHubCompanion.class, "interfacesEncoding");
         hubCompanionAnnotationsEnumConstantsReference = ReflectionUtil.lookupField(DynamicHubCompanion.class, "enumConstantsReference");
+        hubCompanionInterpreterType = ReflectionUtil.lookupField(DynamicHubCompanion.class, "interpreterType");
     }
 
     public void initializeMetaData(ImageHeapScanner heapScanner, AnalysisType type) {
@@ -145,6 +148,11 @@ public void initializeMetaData(ImageHeapScanner heapScanner, AnalysisType type)
                 }
             }
         }
+
+        if (RuntimeClassLoading.isSupported()) {
+            hub.setInterpreterType(RuntimeClassLoading.createInterpreterType(hub, type));
+            heapScanner.rescanField(hub.getCompanion(), hubCompanionInterpreterType);
+        }
     }
 
     /**

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/InterpreterResolvedJavaType.java

@@ -45,6 +45,7 @@
  * closed world e.g. instantiable, instantiated, effectively final ...
  */
 public abstract class InterpreterResolvedJavaType implements ResolvedJavaType {
+    public static final ResolvedJavaMethod[] NO_METHODS = new ResolvedJavaMethod[0];
 
     private final String name;
     private final Class<?> clazz;
@@ -260,8 +261,8 @@ public final ResolvedJavaMethod[] getDeclaredConstructors() {
     }
 
     @Override
-    public final ResolvedJavaMethod[] getDeclaredMethods() {
-        throw VMError.intentionallyUnimplemented();
+    public ResolvedJavaMethod[] getDeclaredMethods() {
+        return NO_METHODS;
     }
 
     @Override

substratevm/src/com.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/InterpreterResolvedObjectType.java

@@ -24,16 +24,20 @@
  */
 package com.oracle.svm.interpreter.metadata;
 
+import static com.oracle.svm.core.BuildPhaseProvider.AfterAnalysis;
+
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.WordBase;
 
+import com.oracle.svm.core.heap.UnknownObjectField;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.interpreter.metadata.serialization.VisibleForSerialization;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public final class InterpreterResolvedObjectType extends InterpreterResolvedJavaType {
@@ -42,6 +46,7 @@ public final class InterpreterResolvedObjectType extends InterpreterResolvedJava
     private final int modifiers;
     private final InterpreterResolvedObjectType superclass;
     private final InterpreterResolvedObjectType[] interfaces;
+    private InterpreterResolvedJavaMethod[] declaredMethods;
 
     // Populated after analysis.
     private InterpreterConstantPool constantPool;
@@ -51,7 +56,9 @@ public final class InterpreterResolvedObjectType extends InterpreterResolvedJava
     private final String sourceFileName;
 
     public static class VTableHolder {
+        @UnknownObjectField(availability = AfterAnalysis.class) //
         public InterpreterResolvedObjectType holder;
+        @UnknownObjectField(availability = AfterAnalysis.class) //
         public InterpreterResolvedJavaMethod[] vtable;
 
         public VTableHolder(InterpreterResolvedObjectType holder, InterpreterResolvedJavaMethod[] vtable) {
@@ -60,6 +67,7 @@ public VTableHolder(InterpreterResolvedObjectType holder, InterpreterResolvedJav
         }
     }
 
+    @UnknownObjectField(availability = AfterAnalysis.class) //
     private VTableHolder vtableHolder = null;
 
     // Debugger side constructor, class is an opaque JavaConstant.
@@ -210,7 +218,6 @@ public InterpreterResolvedJavaMethod[] getVtable() {
     }
 
     public void setVtable(InterpreterResolvedJavaMethod[] vtable) {
-        VMError.guarantee(vtableHolder == null);
         this.vtableHolder = new VTableHolder(this, vtable);
     }
 
@@ -219,4 +226,13 @@ public VTableHolder getVtableHolder() {
         assert !isArray();
         return vtableHolder;
     }
+
+    @Override
+    public ResolvedJavaMethod[] getDeclaredMethods() {
+        return declaredMethods;
+    }
+
+    public void setDeclaredMethods(InterpreterResolvedJavaMethod[] declaredMethods) {
+        this.declaredMethods = declaredMethods;
+    }
 }