Skip scanning base layer static fields.

Author: cstancu

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

@@ -108,6 +108,10 @@ default boolean isCallAllowed(PointsToAnalysis bb, AnalysisMethod caller, Analys
     default void onFieldAccessed(AnalysisField field) {
     }
 
+    @SuppressWarnings("unused")
+    default void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes) {
+    }
+
     @SuppressWarnings("unused")
     default void onTypeInstantiated(AnalysisType type, UsageKind usageKind) {
     }

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

@@ -156,6 +156,10 @@ protected void scanEmbeddedRoot(JavaConstant root, Object position) {
      * @param field the scanned root field
      */
     protected final void scanRootField(AnalysisField field) {
+        if (field.isInBaseLayer()) {
+            // skip base layer roots
+            return;
+        }
         scanField(field, null, null);
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java

@@ -130,6 +130,23 @@ public void onFieldRead(AnalysisField field) {
         AnalysisType declaringClass = field.getDeclaringClass();
         if (field.isStatic()) {
             FieldScan reason = new FieldScan(field);
+            if (field.isInBaseLayer()) {
+                /*
+                 * For base layer static fields we don't want to scan the constant value, but
+                 * instead inject its type state in the field flow. This will be propagated to any
+                 * corresponding field loads.
+                 * 
+                 * GR-52421: the field state needs to be serialized from the base layer analysis
+                 */
+                if (field.getJavaKind().isObject()) {
+                    AnalysisType fieldType = field.getType();
+                    if (fieldType.isArray() || (fieldType.isInstanceClass() && !fieldType.isAbstract())) {
+                        fieldType.registerAsInHeap(field);
+                    }
+                    bb.injectFieldTypes(field, fieldType);
+                }
+                return;
+            }
             if (isValueAvailable(field)) {
                 JavaConstant fieldValue = readStaticFieldValue(field);
                 markReachable(fieldValue, reason);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/CustomTypeFieldHandler.java

@@ -85,7 +85,7 @@ private void injectFieldTypes(AnalysisField field, List<AnalysisType> customType
         injectFieldTypes(field, customTypes.toArray(new AnalysisType[0]));
     }
 
-    protected abstract void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes);
+    public abstract void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes);
 
     private List<AnalysisType> transformTypes(AnalysisField field, List<Class<?>> types) {
         List<AnalysisType> customTypes = new ArrayList<>();

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

@@ -118,6 +118,11 @@ public void onFieldAccessed(AnalysisField field) {
         customTypeFieldHandler.handleField(field);
     }
 
+    @Override
+    public void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes) {
+        customTypeFieldHandler.injectFieldTypes(aField, customTypes);
+    }
+
     @Override
     public void onTypeReachable(AnalysisType type) {
         postTask(d -> {

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

@@ -58,7 +58,7 @@ public NativeImageReachabilityAnalysisEngine(OptionValues options, AnalysisUnive
         this.dynamicHubInitializer = new DynamicHubInitializer(this);
         this.unknownFieldHandler = new CustomTypeFieldHandler(this, metaAccess) {
             @Override
-            protected void injectFieldTypes(AnalysisField aField, AnalysisType... declaredTypes) {
+            public void injectFieldTypes(AnalysisField aField, AnalysisType... declaredTypes) {
                 assert aField.getJavaKind().isObject();
                 markFieldAccessed(aField, "@UnknownObjectField annotated field.");
                 for (AnalysisType declaredType : declaredTypes) {

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

@@ -41,7 +41,7 @@ public PointsToCustomTypeFieldHandler(BigBang bb, AnalysisMetaAccess metaAccess)
      * which are not available during analysis.
      */
     @Override
-    protected void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes) {
+    public void injectFieldTypes(AnalysisField aField, AnalysisType... customTypes) {
         NativeImagePointsToAnalysis analysis = (NativeImagePointsToAnalysis) bb;
 
         assert aField.getJavaKind().isObject();