Move the logging functionality of DynamicAccessInferenceLoggingFeature to a singleton and style fixes.

Author: Aca-S

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java

@@ -55,6 +55,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import com.oracle.svm.hosted.dynamicaccessinference.DynamicAccessInferenceLog;
 import com.oracle.svm.hosted.dynamicaccessinference.StrictDynamicAccessInferenceFeature;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;
@@ -175,6 +176,8 @@ private record CompiledConditionalPattern(ConfigurationCondition condition, Reso
     private int loadedConfigurations;
     private ImageClassLoader imageClassLoader;
 
+    private DynamicAccessInferenceLog inferenceLog;
+
     private class ResourcesRegistryImpl extends ConditionalConfigurationRegistry implements ResourcesRegistry<ConfigurationCondition> {
         private final ClassInitializationSupport classInitializationSupport = ClassInitializationSupport.singleton();
 
@@ -393,6 +396,7 @@ public void afterRegistration(AfterRegistrationAccess a) {
         ImageSingletons.add(RuntimeResourceSupport.class, resourcesRegistry);
         EmbeddedResourcesInfo embeddedResourcesInfo = new EmbeddedResourcesInfo();
         ImageSingletons.add(EmbeddedResourcesInfo.class, embeddedResourcesInfo);
+        inferenceLog = ImageSingletons.contains(DynamicAccessInferenceLog.class) ? DynamicAccessInferenceLog.singleton() : null;
     }
 
     private static ResourcesRegistryImpl resourceRegistryImpl() {
@@ -713,6 +717,9 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                         throw VMError.shouldNotReachHere(e);
                     }
                     b.add(ReachabilityRegistrationNode.create(() -> RuntimeResourceAccess.addResource(clazz.getModule(), resourceName), reason));
+                    if (inferenceLog != null) {
+                        inferenceLog.logRegistration(b, reason, targetMethod, clazz, new String[]{resource});
+                    }
                     return true;
                 }
                 return false;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dataflow/AbstractInterpreter.java

@@ -930,10 +930,10 @@ public static Context create(ResolvedJavaMethod method, int bci, int opcode) {
     }
 
     /**
-     * @return The default abstract value. This value usually represents an over saturated value
+     * @return The default abstract value. This value usually represents an over-saturated value
      *         from which no useful information can be inferred.
      */
-    protected abstract T bottom();
+    protected abstract T defaultValue();
 
     /**
      * Merge two matching operand stack or local variable table values from divergent control flow
@@ -956,7 +956,7 @@ public static Context create(ResolvedJavaMethod method, int bci, int opcode) {
      * @return The value to store in the local variable table.
      */
     protected T storeMethodArgument(ResolvedJavaMethod method, int argumentIndex, int variableIndex) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -966,7 +966,7 @@ protected T storeMethodArgument(ResolvedJavaMethod method, int argumentIndex, in
      * @return The value representing the exception object pushed on the operand stack.
      */
     protected T pushExceptionObject(List<JavaType> exceptionTypes) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -980,7 +980,7 @@ protected T pushExceptionObject(List<JavaType> exceptionTypes) {
      * @return The abstract value to be pushed on the operand stack.
      */
     protected T pushConstant(Context context, AbstractFrame<T> state, Constant constant) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -993,7 +993,7 @@ protected T pushConstant(Context context, AbstractFrame<T> state, Constant const
      * @return The abstract value to be pushed on the operand stack.
      */
     protected T pushType(Context context, AbstractFrame<T> state, JavaType type) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1021,7 +1021,7 @@ protected T loadVariable(Context context, AbstractFrame<T> state, int variableIn
      * @return The abstract value representing the loaded element to be pushed on the operand stack.
      */
     protected T loadArrayElement(Context context, AbstractFrame<T> state, T array, T index) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1063,7 +1063,7 @@ protected void storeArrayElement(Context context, AbstractFrame<T> state, T arra
      * @return The abstract value representing the result of the binary operation.
      */
     protected T binaryOperation(Context context, AbstractFrame<T> state, T left, T right) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1076,7 +1076,7 @@ protected T binaryOperation(Context context, AbstractFrame<T> state, T left, T r
      * @return The abstract value representing the result of the unary operation.
      */
     protected T unaryOperation(Context context, AbstractFrame<T> state, T value) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1091,7 +1091,7 @@ protected T unaryOperation(Context context, AbstractFrame<T> state, T value) {
      * @return The abstract value of the accessed local variable after incrementing.
      */
     protected T incrementVariable(Context context, AbstractFrame<T> state, int variableIndex, int incrementBy, T value) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1104,7 +1104,7 @@ protected T incrementVariable(Context context, AbstractFrame<T> state, int varia
      * @return The abstract value after casting.
      */
     protected T castOperation(Context context, AbstractFrame<T> state, T value) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1118,7 +1118,7 @@ protected T castOperation(Context context, AbstractFrame<T> state, T value) {
      * @return The result of the comparison operation.
      */
     protected T comparisonOperation(Context context, AbstractFrame<T> state, T left, T right) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1204,7 +1204,7 @@ protected void returnVoid(Context context, AbstractFrame<T> state) {
      * @return The abstract representation of the accessed field's value.
      */
     protected T loadStaticField(Context context, AbstractFrame<T> state, JavaField field) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1231,7 +1231,7 @@ protected void storeStaticField(Context context, AbstractFrame<T> state, JavaFie
      * @return The abstract representation of the accessed field's value.
      */
     protected T loadField(Context context, AbstractFrame<T> state, JavaField field, T object) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1260,7 +1260,7 @@ protected void storeField(Context context, AbstractFrame<T> state, JavaField fie
      * @return The abstract representation of the result of the invocation.
      */
     protected T invokeMethod(Context context, AbstractFrame<T> state, JavaMethod method, List<T> operands) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1287,7 +1287,7 @@ protected void invokeVoidMethod(Context context, AbstractFrame<T> state, JavaMet
      * @return Abstract representation of the appendix.
      */
     protected T pushAppendix(JavaMethod method, JavaConstant appendix) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1300,7 +1300,7 @@ protected T pushAppendix(JavaMethod method, JavaConstant appendix) {
      * @return The abstract representation of the object.
      */
     protected T newObject(Context context, AbstractFrame<T> state, JavaType type) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1314,7 +1314,7 @@ protected T newObject(Context context, AbstractFrame<T> state, JavaType type) {
      * @return The abstract representation of the array.
      */
     protected T newArray(Context context, AbstractFrame<T> state, JavaType type, List<T> counts) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1326,7 +1326,7 @@ protected T newArray(Context context, AbstractFrame<T> state, JavaType type, Lis
      * @return The abstract representation of the array's length.
      */
     protected T arrayLength(Context context, AbstractFrame<T> state, T array) {
-        return bottom();
+        return defaultValue();
     }
 
     /**
@@ -1350,7 +1350,7 @@ protected void doThrow(Context context, AbstractFrame<T> state, T throwable) {
      * @return The abstract representation of the instruction's result.
      */
     protected T castCheckOperation(Context context, AbstractFrame<T> state, JavaType type, T object) {
-        return bottom();
+        return defaultValue();
     }
 
     /**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dataflow/DataFlowAnalysisException.java

@@ -35,10 +35,6 @@ public class DataFlowAnalysisException extends RuntimeException {
 
     @Serial private static final long serialVersionUID = 1L;
 
-    public DataFlowAnalysisException() {
-        super();
-    }
-
     public DataFlowAnalysisException(String message) {
         super(message);
     }