[GR-71469] Clarify the APIs for checking supported JavaKinds in the analysis

PullRequest: graal/22681

Author: d-kozak

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

@@ -45,6 +45,7 @@
 import jdk.graal.compiler.word.WordTypes;
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
@@ -96,6 +97,10 @@ default HostedProviders getProviders(AnalysisMethod method) {
 
     boolean trackPrimitiveValues();
 
+    default boolean isSupportedJavaKind(JavaKind javaKind) {
+        return javaKind == JavaKind.Object;
+    }
+
     /** You can blacklist certain callees here. */
     @SuppressWarnings("unused")
     default boolean isCallAllowed(PointsToAnalysis bb, AnalysisMethod caller, AnalysisMethod target, BytecodePosition srcPosition) {

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

@@ -265,9 +265,7 @@ public void forceUnsafeUpdate() {
 
     @Override
     public void registerAsJNIAccessed(AnalysisField field, boolean writable) {
-        if (isSupportedJavaKind(field.getStorageKind())) {
-            field.injectDeclaredType();
-        }
+        field.injectDeclaredType();
     }
 
     /**
@@ -500,7 +498,7 @@ public AnalysisType addRootClass(AnalysisType type, boolean addFields, boolean a
             if (addFields) {
                 field.registerAsAccessed("field of root class");
             }
-            processRootField(field);
+            field.injectDeclaredType();
         }
         if (type.getSuperclass() != null) {
             addRootClass(type.getSuperclass(), addFields, addArrayClass);
@@ -521,22 +519,17 @@ public AnalysisType addRootField(Class<?> clazz, String fieldName) {
     @Override
     public AnalysisType addRootField(AnalysisField field) {
         field.registerAsAccessed((field.isStatic() ? "static" : "instance") + " root field");
-        processRootField(field);
+        field.injectDeclaredType();
         return field.getType();
     }
 
-    private void processRootField(AnalysisField field) {
-        if (isSupportedJavaKind(field.getStorageKind())) {
-            field.injectDeclaredType();
-        }
-    }
-
     @Override
     public void checkUserLimitations() {
     }
 
+    @Override
     public boolean isSupportedJavaKind(JavaKind javaKind) {
-        return javaKind == JavaKind.Object || (trackPrimitiveValues && javaKind.isNumericInteger());
+        return javaKind == JavaKind.Object || (trackPrimitiveValues && javaKind.isPrimitive() && !javaKind.isNumericFloat());
     }
 
     @Override

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

@@ -26,7 +26,6 @@
 
 import java.lang.reflect.Field;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -52,7 +51,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
-import com.oracle.graal.pointsto.meta.PointsToAnalysisField;
 import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.graal.pointsto.util.AnalysisFuture;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
@@ -150,11 +148,7 @@ private void onStaticFieldRead(AnalysisField field) {
              *
              * GR-52421: the field state needs to be serialized from the base layer analysis
              */
-            if (field.getStorageKind().isObject()) {
-                bb.injectFieldTypes(field, List.of(field.getType()), true);
-            } else if (bb.trackPrimitiveValues() && field.getStorageKind().isPrimitive()) {
-                ((PointsToAnalysisField) field).saturatePrimitiveField();
-            }
+            field.injectDeclaredType();
         } else if (isValueAvailable(field, null)) {
             JavaConstant fieldValue = readStaticFieldValue(field);
             if (fieldValue instanceof ImageHeapConstant imageHeapConstant && field.isFinal()) {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/PointsToAnalysisField.java

@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.ContextInsensitiveFieldTypeFlow;
 import com.oracle.graal.pointsto.flow.FieldTypeFlow;
@@ -118,10 +117,17 @@ public FieldTypeFlow getStaticFieldFlow() {
 
     @Override
     public void injectDeclaredType() {
-        BigBang bb = getUniverse().getBigbang();
+        var bb = getUniverse().getBigbang();
+        if (!bb.isSupportedJavaKind(getStorageKind())) {
+            /*
+             * If this JavaKind is not tracked by the analysis, there is no point in inserting any
+             * state into the field.
+             */
+            return;
+        }
         if (getStorageKind().isObject()) {
             bb.injectFieldTypes(this, List.of(this.getType()), true);
-        } else if (bb.trackPrimitiveValues() && getStorageKind().isPrimitive()) {
+        } else {
             this.saturatePrimitiveField();
         }
     }
@@ -151,7 +157,7 @@ public boolean registerAsUnsafeAccessed(Object reason) {
         return false;
     }
 
-    public void saturatePrimitiveField() {
+    private void saturatePrimitiveField() {
         assert fieldType.isPrimitive() || fieldType.isWordType() : this;
         var bb = ((PointsToAnalysis) getUniverse().getBigbang());
         initialFlow.addState(bb, TypeState.anyPrimitiveState());

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

@@ -35,7 +35,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisType;
-import com.oracle.graal.pointsto.meta.PointsToAnalysisField;
 import com.oracle.svm.hosted.analysis.FieldValueComputer;
 
 public final class CustomTypeFieldHandler {
@@ -58,22 +57,20 @@ public void handleField(AnalysisField field) {
          * types as allocated when the field is not yet accessed.
          */
         assert field.isAccessed();
-        if (fieldValueInterceptionSupport.hasFieldValueTransformer(field)) {
-            if (field.getStorageKind().isObject() && !fieldValueInterceptionSupport.isValueAvailable(field, null, !field.isStatic())) {
-                bb.injectFieldTypes(field, List.of(field.getType()), true);
-            } else if (bb.trackPrimitiveValues() && field.getStorageKind().isPrimitive() && field instanceof PointsToAnalysisField ptaField) {
-                ptaField.saturatePrimitiveField();
-            }
+        if (fieldValueInterceptionSupport.hasFieldValueTransformer(field) && !fieldValueInterceptionSupport.isValueAvailable(field, null, !field.isStatic())) {
+            field.injectDeclaredType();
         } else if (fieldValueInterceptionSupport.lookupFieldValueInterceptor(field) instanceof FieldValueComputer fieldValueComputer) {
             if (field.getStorageKind().isObject()) {
+                /* Insert the specified set of types. */
                 List<AnalysisType> types = transformTypes(field, fieldValueComputer.types());
                 for (AnalysisType type : types) {
                     assert !type.isPrimitive() : type + " for " + field;
                     type.registerAsInstantiated("Is declared as the type of an unknown object field.");
                 }
                 bb.injectFieldTypes(field, types, fieldValueComputer.canBeNull());
-            } else if (bb.trackPrimitiveValues() && field.getStorageKind().isPrimitive() && field instanceof PointsToAnalysisField ptaField) {
-                ptaField.saturatePrimitiveField();
+            } else {
+                /* It is a primitive field, let injectDeclaredType handle it. */
+                field.injectDeclaredType();
             }
         }
     }