Load base layer static fields via base layer array base.

Author: cstancu

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

@@ -54,6 +54,7 @@
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -109,6 +110,10 @@ public static Object getStaticPrimitiveFields() {
         return result;
     }
 
+    public static FloatingNode createStaticFieldBaseNode(ResolvedJavaField field) {
+        return new StaticFieldBaseNode(field);
+    }
+
     public static FloatingNode createStaticFieldBaseNode(boolean primitive) {
         return new StaticFieldBaseNode(primitive);
     }
@@ -118,16 +123,24 @@ public static final class StaticFieldBaseNode extends FloatingNode implements Lo
         public static final NodeClass<StaticFieldBaseNode> TYPE = NodeClass.create(StaticFieldBaseNode.class);
 
         public final boolean primitive;
+        public final ResolvedJavaField field;
 
         /**
          * We must not expose that the stamp will eventually be an array, to avoid memory graph
          * problems. See the comment on {@link StaticFieldsSupport}.
          */
         protected StaticFieldBaseNode(boolean primitive) {
             super(TYPE, StampFactory.objectNonNull());
+            this.field = null;
             this.primitive = primitive;
         }
 
+        protected StaticFieldBaseNode(ResolvedJavaField field) {
+            super(TYPE, StampFactory.objectNonNull());
+            this.field = Objects.requireNonNull(field);
+            this.primitive = false; // this value doesn't matter if field is not-null
+        }
+
         /**
          * At first glance, this method looks like a circular dependency:
          * {@link StaticFieldsSupport#getStaticPrimitiveFields} is intrinsified to a
@@ -156,8 +169,22 @@ public void lower(LoweringTool tool) {
                  */
                 return;
             }
-
-            JavaConstant constant = tool.getSnippetReflection().forObject(primitive ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields());
+            JavaConstant constant;
+            if (field != null) {
+                SharedField sharedField = (SharedField) field;
+                if (sharedField.isInBaseLayer()) {
+                    constant = sharedField.getStaticFieldBase();
+                } else {
+                    /*
+                     * Cannot check primitive flag before we know that the field is SharedField, so
+                     * we can access the storage kind.
+                     */
+                    boolean isPrimitive = sharedField.getStorageKind().isPrimitive();
+                    constant = tool.getSnippetReflection().forObject(isPrimitive ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields());
+                }
+            } else {
+                constant = tool.getSnippetReflection().forObject(primitive ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields());
+            }
             assert constant.isNonNull() : constant;
             replaceAndDelete(ConstantNode.forConstant(constant, tool.getMetaAccess(), graph()));
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java

@@ -92,7 +92,6 @@
 import jdk.graal.compiler.replacements.nodes.AssertionNode;
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.code.TargetDescription;
-import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 
@@ -203,7 +202,7 @@ public int arrayLengthOffset() {
     public ValueNode staticFieldBase(StructuredGraph graph, ResolvedJavaField f) {
         SharedField field = (SharedField) f;
         assert field.isStatic();
-        return graph.unique(StaticFieldsSupport.createStaticFieldBaseNode(field.getStorageKind() != JavaKind.Object));
+        return graph.unique(StaticFieldsSupport.createStaticFieldBaseNode(field));
     }
 
     private static ValueNode maybeUncompress(ValueNode node) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SharedField.java

@@ -26,6 +26,7 @@
 
 import com.oracle.svm.core.StaticFieldsSupport;
 
+import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
 
@@ -63,4 +64,9 @@ public interface SharedField extends ResolvedJavaField {
     boolean isValueAvailable();
 
     JavaKind getStorageKind();
+
+    /** Returns true if this field is defined in a base layer. */
+    boolean isInBaseLayer();
+
+    JavaConstant getStaticFieldBase();
 }

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java

@@ -170,6 +170,16 @@ public boolean isValueAvailable() {
         return true;
     }
 
+    @Override
+    public boolean isInBaseLayer() {
+        return false;
+    }
+
+    @Override
+    public JavaConstant getStaticFieldBase() {
+        throw intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport
+    }
+
     @Override
     public String toString() {
         return "SubstrateField<" + format("%h.%n") + " location: " + location + ">";

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java

@@ -279,6 +279,7 @@ private void addStaticFields() {
          */
         for (HostedField field : hUniverse.getFields()) {
             if (field.wrapped.isInBaseLayer()) {
+                /* Base layer static field values are accessed via the base layer arrays. */
                 continue;
             }
             if (Modifier.isStatic(field.getModifiers()) && field.hasLocation() && field.getType().getStorageKind() == JavaKind.Object && field.isRead()) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java

@@ -127,6 +127,7 @@ private void writeStaticFields(RelocatableBuffer buffer) {
         ObjectInfo objectFields = heap.getObjectInfo(StaticFieldsSupport.getStaticObjectFields());
         for (HostedField field : heap.hUniverse.getFields()) {
             if (field.wrapped.isInBaseLayer()) {
+                /* Base layer static field values are accessed via the base layer arrays. */
                 continue;
             }
             if (Modifier.isStatic(field.getModifiers()) && field.hasLocation() && field.isRead()) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedField.java

@@ -24,12 +24,16 @@
  */
 package com.oracle.svm.hosted.meta;
 
+import com.oracle.graal.pointsto.heap.ImageLayerLoader;
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
 import com.oracle.graal.pointsto.infrastructure.WrappedJavaField;
 import com.oracle.graal.pointsto.meta.AnalysisField;
+import com.oracle.graal.pointsto.meta.AnalysisUniverse;
+import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.meta.SharedField;
 import com.oracle.svm.hosted.ameta.FieldValueInterceptionSupport;
 
+import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
 
@@ -168,4 +172,20 @@ public JavaKind getStorageKind() {
     public ResolvedJavaField unwrapTowardsOriginalField() {
         return wrapped;
     }
+
+    @Override
+    public boolean isInBaseLayer() {
+        return wrapped.isInBaseLayer();
+    }
+
+    @Override
+    public JavaConstant getStaticFieldBase() {
+        AnalysisUniverse universe = type.wrapped.getUniverse();
+        boolean primitive = getStorageKind().isPrimitive();
+        if (isInBaseLayer()) {
+            ImageLayerLoader imageLayerLoader = universe.getImageLayerLoader();
+            return primitive ? imageLayerLoader.getBaseLayerStaticPrimitiveFields() : imageLayerLoader.getBaseLayerStaticObjectFields();
+        }
+        return universe.getSnippetReflection().forObject(primitive ? StaticFieldsSupport.getStaticPrimitiveFields() : StaticFieldsSupport.getStaticObjectFields());
+    }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java

@@ -860,7 +860,7 @@ private static boolean processStaticFieldBase(GraphBuilderContext b, Receiver re
 
         /* Emits a null-check for the otherwise unused receiver. */
         receiver.get(true);
-        b.addPush(JavaKind.Object, StaticFieldsSupport.createStaticFieldBaseNode(targetField.getType().isPrimitive()));
+        b.addPush(JavaKind.Object, StaticFieldsSupport.createStaticFieldBaseNode(b.getMetaAccess().lookupJavaField(targetField)));
         return true;
     }