move use of GlobalData to implement GlobalAtomicLong directly into the latter instead of using a FieldValueTransformer

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Fields.java

@@ -32,10 +32,12 @@
 import java.util.Map;
 
 import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Edges;
 import jdk.graal.compiler.libgraal.LibGraalFeature;
 import jdk.internal.misc.Unsafe;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.hosted.Feature.BeforeCompilationAccess;
 
 /**
  * Describes fields in a class, primarily for access via {@link Unsafe}.
@@ -91,6 +93,15 @@ private Field getField(int i) {
         }
     }
 
+    /**
+     * Recomputes the {@link Unsafe} based field offsets and the {@link Edges#getIterationMask()}
+     * derived from them.
+     *
+     * @param access provides the new offsets via {@link BeforeCompilationAccess#objectFieldOffset}
+     * @return a pair (represented as a map entry) where the key is the new offsets and the value is
+     *         the iteration mask
+     *
+     */
     public Map.Entry<long[], Long> recomputeOffsetsAndIterationMask(Feature.BeforeCompilationAccess access) {
         long[] newOffsets = new long[offsets.length];
         for (int i = 0; i < offsets.length; i++) {
@@ -293,7 +304,7 @@ public String getName(int index) {
     /**
      * Gets the type of a field.
      *
-     * @param index index of a field
+     * @param index index of the field
      */
     public Class<?> getType(int index) {
         return types[index];

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeClass.java

@@ -418,7 +418,7 @@ public void duringAnalysis(Feature feature, Feature.DuringAnalysisAccess access)
     /**
      * Describes a field representing an input or successor edge in a node.
      */
-    protected static class EdgeInfo extends FieldsScanner.FieldInfo {
+    public static class EdgeInfo extends FieldsScanner.FieldInfo {
 
         public EdgeInfo(long offset, String name, Class<?> type, Class<?> declaringClass) {
             super(offset, name, type, declaringClass);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/libgraal/LibGraalFeature.java

@@ -67,10 +67,8 @@
 import jdk.graal.compiler.graph.Edges;
 import jdk.graal.compiler.options.OptionDescriptor;
 import jdk.graal.compiler.options.OptionKey;
-import jdk.graal.compiler.serviceprovider.GlobalAtomicLong;
 import jdk.graal.compiler.core.common.FeatureComponent;
 import jdk.graal.nativeimage.LibGraalLoader;
-import jdk.graal.nativeimage.hosted.GlobalData;
 import jdk.vm.ci.hotspot.HotSpotModifiers;
 import org.graalvm.nativeimage.hosted.RuntimeSystemProperties;
 
@@ -187,11 +185,8 @@ public void duringSetup(DuringSetupAccess access) {
     private OptionCollector optionCollector;
 
     /**
-     * Collects all options that are reachable at run time. Reachable options are the
-     * {@link OptionKey} instances reached by the static analysis. The VM options are instances of
-     * {@link OptionKey} loaded by the {@code com.oracle.svm.hosted.NativeImageClassLoader} and
-     * compiler options are instances of {@link OptionKey} loaded by the
-     * {@code HostedLibGraalClassLoader}.
+     * Collects all instances of the LibGraalLoader loaded {@link OptionKey} class reached by the
+     * static analysis.
      */
     private class OptionCollector implements Consumer<OptionKey<?>> {
         private final Set<OptionKey<?>> options = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -289,35 +284,11 @@ private Map.Entry<long[], Long> computeReplacement(Object receiver) {
         }
     }
 
-    /**
-     * Transforms {@code GlobalAtomicLong.addressSupplier} by replacing it with a {@link GlobalData}
-     * backed address supplier.
-     */
-    static class GlobalAtomicLongTransformer implements FieldValueTransformer {
-
-        void register(BeforeAnalysisAccess access) {
-            Field addressSupplierField = lookupField(GlobalAtomicLong.class, "addressSupplier");
-            access.registerFieldValueTransformer(addressSupplierField, this);
-        }
-
-        @Override
-        public Object transform(Object receiver, Object originalValue) {
-            long initialValue;
-            try {
-                initialValue = ((GlobalAtomicLong) receiver).getInitialValue();
-            } catch (Throwable e) {
-                throw GraalError.shouldNotReachHere(e);
-            }
-            return GlobalData.createGlobal(initialValue);
-        }
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
 
         new FieldOffsetsTransformer().register(access);
-        new GlobalAtomicLongTransformer().register(access);
 
         /* Contains static fields that depend on HotSpotJVMCIRuntime */
         RuntimeClassInitialization.initializeAtRunTime(HotSpotModifiers.class);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java

@@ -54,8 +54,8 @@ public class OptionsParser {
      *
      * @param descriptors set of compiler options available in libgraal. These correspond to the
      *            reachable {@link OptionKey}s discovered during Native Image static analysis. This
-     *            field is only non-null when {@link OptionsParser} is loaded by the
-     *            LibGraalClassLoader.
+     *            field is only non-null when {@link OptionsParser} is loaded by a
+     *            {@link jdk.graal.nativeimage.LibGraalLoader}.
      * @param enterpriseOptions {@linkplain OptionKey#getName() names} of enterprise options
      */
     public record LibGraalOptionsInfo(EconomicMap<String, OptionDescriptor> descriptors, Set<String> enterpriseOptions) {
@@ -66,7 +66,7 @@ public static LibGraalOptionsInfo create() {
 
     /**
      * Compiler options info available in libgraal. This field is only non-null when
-     * {@link OptionsParser} is loaded by the LibGraalClassLoader.
+     * {@link OptionsParser} is loaded by a {@link jdk.graal.nativeimage.LibGraalLoader}.
      */
     private static LibGraalOptionsInfo libgraalOptions;
 
@@ -81,8 +81,8 @@ public static Iterable<OptionDescriptors> getOptionsLoader() {
         boolean inLibGraal = libgraalOptions != null;
         if (inLibGraal && inImageBuildtimeCode()) {
             /*
-             * Graal code is being run in the context of the LibGraalClassLoader while building
-             * libgraal so use the LibGraalClassLoader to load the OptionDescriptors.
+             * Graal code is being run is loaded by a LibGraalLoader while building libgraal so use
+             * the loader to load the OptionDescriptors.
              */
             ClassLoader myCL = OptionsParser.class.getClassLoader();
             return ServiceLoader.load(OptionDescriptors.class, myCL);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GlobalAtomicLong.java

@@ -29,9 +29,12 @@
 import java.util.function.Supplier;
 
 import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.nativeimage.LibGraalLoader;
 import jdk.graal.nativeimage.hosted.GlobalData;
 import jdk.internal.misc.Unsafe;
 import org.graalvm.nativeimage.ImageInfo;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 
 /**
  * A shareable long value in the JVM process that is updated atomically. The long value is stored in
@@ -48,6 +51,7 @@ public class GlobalAtomicLong {
     /**
      * Cleaner for freeing {@link #address}.
      */
+    @Platforms(Platform.HOSTED_ONLY.class) //
     private static Cleaner cleaner;
 
     /**
@@ -83,20 +87,24 @@ public GlobalAtomicLong(String name, long initialValue) {
         if (ImageInfo.inImageRuntimeCode()) {
             throw GraalError.shouldNotReachHere("Cannot create " + getClass().getName() + " objects in native image runtime");
         } else {
-            addressSupplier = () -> {
-                if (ImageInfo.inImageRuntimeCode()) {
-                    throw GraalError.shouldNotReachHere("The addressSupplier field value should have been replaced at image build time");
-                }
-                long addr = UNSAFE.allocateMemory(Long.BYTES);
-                synchronized (GlobalAtomicLong.class) {
-                    if (cleaner == null) {
-                        cleaner = Cleaner.create();
+            if (ImageInfo.inImageBuildtimeCode() && GlobalAtomicLong.class.getClassLoader() instanceof LibGraalLoader) {
+                addressSupplier = GlobalData.createGlobal(initialValue);
+            } else {
+                addressSupplier = () -> {
+                    if (ImageInfo.inImageRuntimeCode()) {
+                        throw GraalError.shouldNotReachHere("The addressSupplier field value should have been replaced at image build time");
                     }
-                    cleaner.register(GlobalAtomicLong.this, () -> UNSAFE.freeMemory(addr));
-                }
-                UNSAFE.putLongVolatile(null, addr, initialValue);
-                return addr;
-            };
+                    long addr = UNSAFE.allocateMemory(Long.BYTES);
+                    synchronized (GlobalAtomicLong.class) {
+                        if (cleaner == null) {
+                            cleaner = Cleaner.create();
+                        }
+                        cleaner.register(GlobalAtomicLong.this, () -> UNSAFE.freeMemory(addr));
+                    }
+                    UNSAFE.putLongVolatile(null, addr, initialValue);
+                    return addr;
+                };
+            }
         }
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalServices.java

@@ -70,7 +70,7 @@ public static boolean isInLibgraal() {
 
     /**
      * The set of services available in libgraal. This field is only non-null when
-     * {@link GraalServices} is loaded by the LibGraalClassLoader.
+     * {@link GraalServices} is loaded by a {@link LibGraalLoader}.
      */
     private static final Map<Class<?>, List<?>> libgraalServices;
 
@@ -173,7 +173,7 @@ public static Properties getSystemProperties(String justification) {
     public static Map<String, String> getSavedProperties() {
         if (inImageBuildtimeCode()) {
             // Avoid calling down to JVMCI native methods as they will fail to
-            // link in a copy of JVMCI loaded by the LibGraalClassLoader.
+            // link in a copy of JVMCI loaded by a LibGraalLoader.
             return jdk.internal.misc.VM.getSavedProperties();
         }
         return Services.getSavedProperties();