[GR-53530] Make static fields base support layer aware.

PullRequest: graal/20018

Author: teshull

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/StaticFieldsSupport.java

@@ -57,6 +57,7 @@
 import com.oracle.svm.core.heap.RestrictHeapAccess;
 import com.oracle.svm.core.heap.UnknownPrimitiveField;
 import com.oracle.svm.core.jdk.RuntimeSupport;
+import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.option.RuntimeOptionKey;
 import com.oracle.svm.core.stack.StackOverflowCheck;
@@ -223,7 +224,8 @@ private static boolean isValid(Isolate isolate) {
          * value as an extra sanity check. Note that the heap base register still contains an
          * invalid value when we execute this code, which makes things a bit more complex.
          */
-        UnsignedWord staticFieldsOffsets = ReferenceAccess.singleton().getCompressedRepresentation(StaticFieldsSupport.getStaticPrimitiveFields());
+        UnsignedWord staticFieldsOffsets = ReferenceAccess.singleton()
+                        .getCompressedRepresentation(StaticFieldsSupport.getStaticPrimitiveFieldsAtRuntime(MultiLayeredImageSingleton.UNKNOWN_LAYER_NUMBER));
         UnsignedWord wellKnownFieldOffset = staticFieldsOffsets.shiftLeft(ReferenceAccess.singleton().getCompressionShift()).add(Word.unsigned(offsetOfStaticFieldWithWellKnownValue));
         Pointer wellKnownField = ((Pointer) isolate).add(wellKnownFieldOffset);
         return wellKnownField.readLong(0) == MARKER_VALUE;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java

@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.imagelayer;
+package com.oracle.svm.core.fieldvaluetransformer;
 
 import java.util.function.Function;
 
-import com.oracle.svm.core.fieldvaluetransformer.FieldValueTransformerWithAvailability;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.ResolvedJavaField;
 
 /**
  * Special field value transformer which, instead of returning an object, returns an
  * {@link JavaConstant} of the transformed value.
  */
 public interface ObjectToConstantFieldValueTransformer extends FieldValueTransformerWithAvailability {
 
-    JavaConstant transformToConstant(Object receiver, Object originalValue, Function<Object, JavaConstant> toConstant);
+    JavaConstant transformToConstant(ResolvedJavaField field, Object receiver, Object originalValue, Function<Object, JavaConstant> toConstant);
 
     @Override
     default Object transform(Object receiver, Object originalValue) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/ObjectToConstantFieldValueTransformer.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/fieldvaluetransformer/ObjectToConstantFieldValueTransformer.java

@@ -25,6 +25,7 @@
 package com.oracle.svm.core.fieldvaluetransformer;
 
 import java.lang.reflect.Field;
+import java.util.function.Function;
 
 import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.StaticFieldsSupport;
@@ -33,24 +34,25 @@
 import jdk.graal.compiler.nodes.ValueNode;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
 import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.ResolvedJavaField;
 
 /**
  * Implements the field value transformation semantics of {@link Kind#StaticFieldBase}.
  */
-public record StaticFieldBaseFieldValueTransformer(Field targetField) implements FieldValueTransformerWithAvailability {
+public record StaticFieldBaseFieldValueTransformer(Field targetField) implements ObjectToConstantFieldValueTransformer {
 
     @Override
     public boolean isAvailable() {
         return BuildPhaseProvider.isHostedUniverseBuilt();
     }
 
     @Override
-    public Object transform(Object receiver, Object originalValue) {
-        return targetField.getType().isPrimitive() ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields();
+    public JavaConstant transformToConstant(ResolvedJavaField field, Object receiver, Object originalValue, Function<Object, JavaConstant> toConstant) {
+        return StaticFieldsSupport.getStaticFieldsConstant(field, toConstant);
     }
 
     @Override
     public ValueNode intrinsify(CoreProviders providers, JavaConstant receiver) {
-        return StaticFieldsSupport.createStaticFieldBaseNode(targetField.getType().isPrimitive());
+        return StaticFieldsSupport.createStaticFieldBaseNode(providers.getMetaAccess().lookupJavaField(targetField));
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/fieldvaluetransformer/StaticFieldBaseFieldValueTransformer.java

@@ -71,6 +71,7 @@
 import com.oracle.svm.core.heap.dump.HeapDumpMetadata.FieldNameAccess;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.LayoutEncoding;
+import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.nmt.NmtCategory;
 import com.oracle.svm.core.os.BufferedFileOperationSupport;
@@ -686,9 +687,9 @@ private void writeFieldDescriptors(int fieldCount, FieldInfoPointer fieldInfos,
 
     private static Object getStaticFieldDataHolder(HProfType type) {
         if (type == HProfType.NORMAL_OBJECT) {
-            return StaticFieldsSupport.getStaticObjectFields();
+            return StaticFieldsSupport.getStaticObjectFieldsAtRuntime(MultiLayeredImageSingleton.UNKNOWN_LAYER_NUMBER);
         } else {
-            return StaticFieldsSupport.getStaticPrimitiveFields();
+            return StaticFieldsSupport.getStaticPrimitiveFieldsAtRuntime(MultiLayeredImageSingleton.UNKNOWN_LAYER_NUMBER);
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpWriter.java

@@ -25,10 +25,13 @@
 package com.oracle.svm.core.imagelayer;
 
 import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.graal.code.CGlobalDataInfo;
 import com.oracle.svm.core.meta.SharedMethod;
 
+@Platforms(Platform.HOSTED_ONLY.class)
 public abstract class DynamicImageLayerInfo {
     public static final int CREMA_LAYER_ID = Byte.MAX_VALUE;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/imagelayer/DynamicImageLayerInfo.java

@@ -40,7 +40,6 @@
 import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
-import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.InjectAccessors;
@@ -259,18 +258,6 @@ public static int getCommonPoolParallelism() {
         return ForkJoinPoolCommonAccessor.get().getParallelism();
     }
 
-    @Alias //
-    private static Unsafe U;
-
-    @Alias //
-    private static long POOLIDS;
-
-    @Substitute
-    private static int getAndAddPoolIds(int x) {
-        // Original method wrongly uses ForkJoinPool.class instead of calling U.staticFieldBase()
-        return U.getAndAddInt(StaticFieldsSupport.getStaticPrimitiveFields(), POOLIDS, x);
-    }
-
     @Alias //
     Target_java_util_concurrent_ForkJoinPool(byte forCommonPoolOnly) {
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.jdk;
 
+import java.util.function.Function;
+
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.BuildPhaseProvider;
@@ -35,6 +37,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.fieldvaluetransformer.FieldValueTransformerWithAvailability;
+import com.oracle.svm.core.fieldvaluetransformer.ObjectToConstantFieldValueTransformer;
 import com.oracle.svm.core.graal.nodes.FieldOffsetNode;
 import com.oracle.svm.core.util.VMError;
 
@@ -109,17 +112,17 @@ class VarHandleFieldOffsetAsLongComputer extends VarHandleFieldOffsetComputer {
     }
 }
 
-class VarHandleStaticBaseComputer implements FieldValueTransformerWithAvailability {
+class VarHandleStaticBaseComputer implements ObjectToConstantFieldValueTransformer {
     @Override
     public boolean isAvailable() {
         return BuildPhaseProvider.isHostedUniverseBuilt();
     }
 
     @Override
-    public Object transform(Object receiver, Object originalValue) {
-        ResolvedJavaField field = VarHandleSupport.singleton().findVarHandleField(receiver, false);
-        StaticFieldsSupport.StaticFieldValidator.checkFieldOffsetAllowed(field);
-        return field.getType().getJavaKind().isPrimitive() ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields();
+    public JavaConstant transformToConstant(ResolvedJavaField field, Object receiver, Object originalValue, Function<Object, JavaConstant> toConstant) {
+        ResolvedJavaField varHandleField = VarHandleSupport.singleton().findVarHandleField(receiver, false);
+        StaticFieldsSupport.StaticFieldValidator.checkFieldOffsetAllowed(varHandleField);
+        return StaticFieldsSupport.getStaticFieldsConstant(varHandleField, toConstant);
     }
 
     @Override
@@ -128,7 +131,7 @@ public ValueNode intrinsify(CoreProviders providers, JavaConstant receiver) {
         if (varHandle != null) {
             ResolvedJavaField field = VarHandleSupport.singleton().findVarHandleField(varHandle, false);
             StaticFieldsSupport.StaticFieldValidator.checkFieldOffsetAllowed(field);
-            return StaticFieldsSupport.createStaticFieldBaseNode(field.getType().getJavaKind().isPrimitive());
+            return StaticFieldsSupport.createStaticFieldBaseNode(field);
         }
         return null;
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleSupport.java

@@ -26,7 +26,6 @@
 
 import java.lang.reflect.Modifier;
 
-import jdk.graal.compiler.word.Word;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
@@ -37,8 +36,12 @@
 import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.heap.UnknownPrimitiveField;
+import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
 import com.oracle.svm.core.jni.headers.JNIFieldId;
+import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
+import com.oracle.svm.core.util.VMError;
 
+import jdk.graal.compiler.word.Word;
 import jdk.vm.ci.meta.JavaKind;
 
 /**
@@ -51,8 +54,11 @@ public final class JNIAccessibleField extends JNIAccessibleMember {
     private static final UnsignedWord ID_OBJECT_FLAG = ID_STATIC_FLAG.unsignedShiftRight(1);
     /* 00100000...0 */
     private static final UnsignedWord ID_NEGATIVE_FLAG = ID_OBJECT_FLAG.unsignedShiftRight(1);
-    /* 00111111...1 */
-    private static final UnsignedWord ID_OFFSET_MASK = ID_NEGATIVE_FLAG.subtract(1);
+    /* 00010000...0 */
+    private static final UnsignedWord ID_LAYER_NUMBER_MASK = ID_NEGATIVE_FLAG.unsignedShiftRight(1);
+    private static final int ID_LAYER_NUMBER_SHIFT = 60;
+    /* 00001111...1 */
+    private static final UnsignedWord ID_OFFSET_MASK = ID_LAYER_NUMBER_MASK.subtract(1);
 
     public static JNIAccessibleField negativeFieldQuery(JNIAccessibleClass jniClass) {
         return new JNIAccessibleField(jniClass, null, 0);
@@ -62,8 +68,8 @@ public static JNIAccessibleField negativeFieldQuery(JNIAccessibleClass jniClass)
      * For instance fields, the offset of the field in an object of the
      * {@linkplain JNIAccessibleMember#getDeclaringClass() declaring class}. For static fields,
      * depending on the field's type, the offset of the field in either
-     * {@link StaticFieldsSupport#getStaticPrimitiveFields()} or
-     * {@link StaticFieldsSupport#getStaticObjectFields()}.
+     * {@link StaticFieldsSupport#getStaticPrimitiveFieldsAtRuntime} or
+     * {@link StaticFieldsSupport#getStaticObjectFieldsAtRuntime}.
      */
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static WordBase getOffsetFromId(JNIFieldId id) {
@@ -72,6 +78,27 @@ public static WordBase getOffsetFromId(JNIFieldId id) {
         return result;
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static Object getStaticObjectFieldsAtRuntime(JNIFieldId fieldId) {
+        int layerNumber = getLayerNumberFromId((UnsignedWord) fieldId);
+        return StaticFieldsSupport.getStaticObjectFieldsAtRuntime(layerNumber);
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static Object getStaticPrimitiveFieldsAtRuntime(JNIFieldId fieldId) {
+        int layerNumber = getLayerNumberFromId((UnsignedWord) fieldId);
+        return StaticFieldsSupport.getStaticPrimitiveFieldsAtRuntime(layerNumber);
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    private static int getLayerNumberFromId(UnsignedWord id) {
+        if (ImageLayerBuildingSupport.buildingImageLayer()) {
+            return (int) id.and(ID_LAYER_NUMBER_MASK).unsignedShiftRight(ID_LAYER_NUMBER_SHIFT).rawValue();
+        } else {
+            return MultiLayeredImageSingleton.UNUSED_LAYER_NUMBER;
+        }
+    }
+
     @Platforms(HOSTED_ONLY.class) private final UnsignedWord flags;
 
     /**
@@ -121,11 +148,17 @@ public boolean isNegative() {
     }
 
     @Platforms(HOSTED_ONLY.class)
-    public void finishBeforeCompilation(int offset, EconomicSet<Class<?>> hidingSubclasses) {
+    public void finishBeforeCompilation(int offset, int layerNumber, EconomicSet<Class<?>> hidingSubclasses) {
         assert id.equal(0);
         assert isNegativeHosted() || ID_OFFSET_MASK.and(offset).equal(offset) : "Offset is too large to be encoded in the JNIAccessibleField ID";
 
         id = isNegativeHosted() ? flags : flags.or(offset);
+        if (layerNumber == 1 || layerNumber == 0) {
+            id = id.or(Word.unsigned(layerNumber).shiftLeft(ID_LAYER_NUMBER_SHIFT));
+            VMError.guarantee(getLayerNumberFromId(id) == layerNumber);
+        } else {
+            assert layerNumber == MultiLayeredImageSingleton.UNUSED_LAYER_NUMBER;
+        }
         setHidingSubclasses(hidingSubclasses);
     }
 }