[GR-72050] Refactor layer features for Terminus

PullRequest: graal/23193

Author: Zeavee

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ClassInclusionPolicy.java

@@ -28,7 +28,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.util.AnalysisError;
-import com.oracle.svm.util.OriginalClassProvider;
 
 import jdk.vm.ci.meta.ModifiersProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -234,7 +233,7 @@ private static boolean isMethodAccessible(ResolvedJavaMethod method) {
             /* Protected methods from non-final non-sealed classes should be accessible. */
             AnalysisError.guarantee(method.isProtected());
             ResolvedJavaType declaringClass = method.getDeclaringClass();
-            return !declaringClass.isFinalFlagSet() && !OriginalClassProvider.getJavaClass(declaringClass).isSealed();
+            return !declaringClass.isFinalFlagSet() && !declaringClass.isSealed();
         }
 
         @Override

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java

@@ -26,7 +26,6 @@
 
 import static com.oracle.svm.guest.staging.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
@@ -50,6 +49,7 @@
 import com.oracle.svm.shared.singletons.traits.SingletonLayeredInstallationKind.Duplicable;
 import com.oracle.svm.shared.singletons.traits.SingletonTraits;
 import com.oracle.svm.util.AnnotationUtil;
+import com.oracle.svm.util.GuestAccess;
 
 import jdk.graal.compiler.api.directives.GraalDirectives;
 import jdk.graal.compiler.api.replacements.Fold;
@@ -60,6 +60,7 @@
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.UnresolvedJavaType;
 
@@ -370,7 +371,7 @@ public void onSingletonRegistration(ImageSingletonLoader loader, ObjectLayout si
                     List<Integer> currentValues = singleton.getCurrentValues();
                     List<Integer> priorValues = loader.readIntList("priorValues");
 
-                    var numFields = Arrays.stream(ObjectLayout.class.getDeclaredFields()).filter(Predicate.not(Field::isSynthetic)).count();
+                    var numFields = Arrays.stream(GuestAccess.get().lookupType(ObjectLayout.class).getInstanceFields(false)).filter(Predicate.not(ResolvedJavaField::isSynthetic)).count();
                     VMError.guarantee(numFields - 1 == currentValues.size(), "Missing fields");
 
                     VMError.guarantee(currentValues.equals(priorValues),

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java

@@ -59,6 +59,7 @@
 import com.oracle.svm.util.TypeResult;
 
 import jdk.graal.compiler.annotation.AnnotationValue;
+import jdk.graal.compiler.vmaccess.ResolvedJavaModule;
 import jdk.graal.compiler.vmaccess.ResolvedJavaPackage;
 import jdk.graal.compiler.vmaccess.VMAccess;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -107,7 +108,7 @@ public final class ImageClassLoader {
     /**
      * Modules containing all {@code svm.core} and {@code svm.hosted} classes.
      */
-    private Set<Module> builderModules;
+    private Set<ResolvedJavaModule> builderModules;
 
     ImageClassLoader(Platform platform, NativeImageClassLoaderSupport classLoaderSupport, VMAccess vmAccess) {
         this.platform = platform;
@@ -232,7 +233,8 @@ public ClassLoader getDynamicHubClassLoader(Class<?> clazz) {
     }
 
     public boolean isCoreType(Class<?> clazz) {
-        return getBuilderModules().contains(clazz.getModule());
+        GuestAccess guestAccess = GuestAccess.get();
+        return getBuilderModules().contains(guestAccess.getModule(guestAccess.lookupType(clazz)));
     }
 
     /**
@@ -618,16 +620,17 @@ public boolean noEntryForURI(EconomicSet<String> set) {
         return classLoaderSupport.noEntryForURI(set);
     }
 
-    public Set<Module> getBuilderModules() {
+    public Set<ResolvedJavaModule> getBuilderModules() {
         assert builderModules != null : "Builder modules not yet initialized.";
         return builderModules;
     }
 
     public void initBuilderModules() {
         VMError.guarantee(BuildPhaseProvider.isFeatureRegistrationFinished() && ImageSingletons.contains(VMFeature.class),
                         "Querying builder modules is only possible after feature registration is finished.");
-        Module m0 = ImageSingletons.lookup(VMFeature.class).getClass().getModule();
-        Module m1 = SVMHost.class.getModule();
+        GuestAccess guestAccess = GuestAccess.get();
+        ResolvedJavaModule m0 = guestAccess.getModule(guestAccess.lookupType(ImageSingletons.lookup(VMFeature.class).getClass()));
+        ResolvedJavaModule m1 = guestAccess.getModule(guestAccess.lookupType(SVMHost.class));
         builderModules = m0.equals(m1) ? Set.of(m0) : Set.of(m0, m1);
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java

@@ -331,7 +331,7 @@ public SVMHost(OptionValues options, ImageClassLoader loader, ClassInitializatio
      */
     @Override
     public boolean isCoreType(ResolvedJavaType type) {
-        return loader.getBuilderModules().contains(OriginalClassProvider.getJavaClass(type).getModule());
+        return loader.getBuilderModules().contains(GuestAccess.get().getModule(OriginalClassProvider.getOriginalType(type)));
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LayeredClassInitialization.java

@@ -26,13 +26,15 @@
 
 import org.graalvm.nativeimage.ImageSingletons;
 
-import jdk.vm.ci.meta.MetaAccessProvider;
+import com.oracle.graal.pointsto.infrastructure.Universe;
+
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 public abstract class LayeredClassInitialization {
 
     static LayeredClassInitialization singleton() {
         return ImageSingletons.lookup(LayeredClassInitialization.class);
     }
 
-    abstract void initializeClassInAppLayer(Class<?> c, MetaAccessProvider meta);
+    abstract void initializeClassInAppLayer(ResolvedJavaType type, Universe universe);
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LayeredDispatchTableFeature.java

@@ -72,12 +72,14 @@
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.hosted.meta.VTableBuilder;
+import com.oracle.svm.util.GuestAccess;
 import com.oracle.svm.util.OriginalClassProvider;
 import com.oracle.svm.util.OriginalMethodProvider;
 
 import jdk.graal.compiler.code.CompilationResult;
 import jdk.graal.compiler.core.common.NumUtil;
 import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.vmaccess.ResolvedJavaModule;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -135,7 +137,7 @@ public class LayeredDispatchTableFeature implements InternalFeature {
     /**
      * Cache of builderModules. Set in {@link #beforeCompilation}.
      */
-    private Set<Module> builderModules;
+    private Set<ResolvedJavaModule> builderModules;
 
     static final int INVALID_HOSTED_METHOD_INDEX = -1;
 
@@ -246,7 +248,7 @@ public static LayeredDispatchTableFeature singleton() {
         return ImageSingletons.lookup(LayeredDispatchTableFeature.class);
     }
 
-    void installBuilderModules(Set<Module> newCoreTypes) {
+    void installBuilderModules(Set<ResolvedJavaModule> newCoreTypes) {
         assert builderModules == null : builderModules;
         builderModules = newCoreTypes;
     }
@@ -256,8 +258,9 @@ void installBuilderModules(Set<Module> newCoreTypes) {
      * we filter our all calls either originating from or targeting a {@link #builderModules}.
      */
     public void recordVirtualCallTarget(HostedMethod caller, HostedMethod callee) {
-        Module callerModule = caller.getDeclaringClass().getJavaClass().getModule();
-        Module calleeModule = callee.getDeclaringClass().getJavaClass().getModule();
+        GuestAccess guestAccess = GuestAccess.get();
+        ResolvedJavaModule callerModule = guestAccess.getModule(OriginalClassProvider.getOriginalType(caller.getDeclaringClass()));
+        ResolvedJavaModule calleeModule = guestAccess.getModule(OriginalClassProvider.getOriginalType(callee.getDeclaringClass()));
         if (!(builderModules.contains(callerModule) && !isFactoryMethod(caller)) && !builderModules.contains(calleeModule)) {
             virtualCallTargets.add(callee);
         }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/LayeredStaticFieldSupport.java

@@ -24,8 +24,6 @@
  */
 package com.oracle.svm.hosted.imagelayer;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -39,6 +37,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.heap.ImageHeapRelocatableConstant;
+import com.oracle.graal.pointsto.infrastructure.Universe;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -71,8 +70,8 @@
 import jdk.graal.compiler.nodes.calc.FloatingNode;
 import jdk.graal.compiler.nodes.spi.LoweringTool;
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * This class keeps track of the location of static fields assigned in previous layers as well as
@@ -180,9 +179,8 @@ public void ensureInitializedFromFieldData(AnalysisField aField, SharedLayerSnap
         assert priorInstalledLocation.equals(result);
     }
 
-    private void installFieldInAppLayer(Field field, MetaAccessProvider meta) {
-        AnalysisField aField = (AnalysisField) meta.lookupJavaField(field);
-        installFieldInAppLayer(aField);
+    private void installFieldInAppLayer(ResolvedJavaField field, Universe universe) {
+        installFieldInAppLayer((AnalysisField) universe.lookup(field));
     }
 
     void installFieldInAppLayer(AnalysisField aField) {
@@ -231,11 +229,9 @@ void installFieldInAppLayer(AnalysisField aField) {
     }
 
     @Override
-    void initializeClassInAppLayer(Class<?> c, MetaAccessProvider meta) {
-        for (var field : c.getDeclaredFields()) {
-            if (Modifier.isStatic(field.getModifiers())) {
-                installFieldInAppLayer(field, meta);
-            }
+    void initializeClassInAppLayer(ResolvedJavaType type, Universe universe) {
+        for (var field : type.getStaticFields()) {
+            installFieldInAppLayer(field, universe);
         }
     }