Remove ReadableJavaField.isValueAvailableBeforeAnalysis

Author: Christian Wimmer

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

@@ -26,8 +26,6 @@
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.util.GraalAccess;
-import com.oracle.svm.core.BuildPhaseProvider;
-import com.oracle.svm.core.fieldvaluetransformer.FieldValueTransformerWithAvailability.ValueAvailability;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.meta.HostedField;
@@ -96,19 +94,7 @@ static JavaConstant readFieldValue(MetaAccessProvider metaAccess, ClassInitializ
 
     JavaConstant readValue(MetaAccessProvider metaAccess, ClassInitializationSupport classInitializationSupport, JavaConstant receiver);
 
-    /**
-     * When this method returns true, image heap snapshotting can access the value before analysis.
-     * If the field is final, then the value can also be constant folded before analysis.
-     *
-     * The introduction of this method pre-dates {@link ValueAvailability}, i.e., we could combine
-     * this method and {@link #isValueAvailable} into a single method that returns the
-     * {@link ValueAvailability} of the field.
-     */
-    boolean isValueAvailableBeforeAnalysis();
-
-    default boolean isValueAvailable() {
-        return isValueAvailableBeforeAnalysis() || BuildPhaseProvider.isAnalysisFinished();
-    }
+    boolean isValueAvailable();
 
     boolean injectFinalForRuntimeCompilation();
 

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

@@ -58,7 +58,7 @@ public void handleField(AnalysisField field) {
          */
         assert field.isAccessed();
         if (field.wrapped instanceof ComputedValueField computedField) {
-            if (!computedField.isValueAvailableBeforeAnalysis() && field.getStorageKind().isObject()) {
+            if (!computedField.isValueAvailable() && field.getJavaKind().isObject()) {
                 injectFieldTypes(field, field.getType());
             } else if (bb.trackPrimitiveValues() && field.getStorageKind().isPrimitive() && field instanceof PointsToAnalysisField ptaField) {
                 ptaField.saturatePrimitiveField();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedField.java

@@ -29,6 +29,7 @@
 import java.lang.reflect.Field;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
+import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.hosted.ameta.ReadableJavaField;
 import com.oracle.svm.hosted.annotation.AnnotationValue;
 import com.oracle.svm.hosted.annotation.AnnotationWrapper;
@@ -67,12 +68,12 @@ public JavaConstant readValue(MetaAccessProvider metaAccess, ClassInitialization
     }
 
     @Override
-    public boolean isValueAvailableBeforeAnalysis() {
+    public boolean isValueAvailable() {
         /*
          * We assume that fields for which this class is used always have altered behavior for which
-         * constant folding is not valid.
+         * constant folding before or during analysis is not valid.
          */
-        return false;
+        return BuildPhaseProvider.isAnalysisFinished();
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java

@@ -182,11 +182,6 @@ public static boolean isOffsetRecomputation(RecomputeFieldValue.Kind kind) {
         return offsetComputationKinds.contains(kind);
     }
 
-    @Override
-    public boolean isValueAvailableBeforeAnalysis() {
-        return isValueAvailableBeforeAnalysis;
-    }
-
     @Override
     public boolean isValueAvailable() {
         /*
@@ -196,7 +191,7 @@ public boolean isValueAvailable() {
          * value available when strengthening graphs after analysis, i.e., when applying analysis
          * results back into the IR.
          */
-        return constantValue != null || isValueAvailableBeforeAnalysis() ||
+        return constantValue != null || isValueAvailableBeforeAnalysis ||
                         (isValueAvailableOnlyAfterAnalysis && BuildPhaseProvider.isHostedUniverseBuilt()) ||
                         (isValueAvailableOnlyAfterCompilation && BuildPhaseProvider.isCompilationFinished());
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionField.java

@@ -56,7 +56,7 @@ public SubstitutionField(ResolvedJavaField original, ResolvedJavaField annotated
     }
 
     @Override
-    public boolean isValueAvailableBeforeAnalysis() {
+    public boolean isValueAvailable() {
         return true;
     }