Make ConcurrentAnalysisAccessImpl available before-analysis.

Author: cstancu

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

@@ -608,7 +608,7 @@ protected void onObjectReachable(ImageHeapConstant imageHeapConstant, ScanReason
                  * conditions, e.g., a started Thread should never be added to the image heap, but
                  * the structure of the object is valid, as ensured by the validity check above.
                  */
-                objectType.notifyObjectReachable(universe.getConcurrentAnalysisAccess(), object, reason);
+                objectType.notifyObjectReachable(object, reason);
             } catch (UnsupportedFeatureException e) {
                 /* Enhance the unsupported feature message with the object trace and rethrow. */
                 StringBuilder backtrace = new StringBuilder();

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

@@ -517,9 +517,9 @@ public JavaConstant getConstantValue() {
     }
 
     /**
-     * Ensure that all reachability handler that were present at the time the declaring type was
-     * marked as reachable are executed before accessing field values. This allows field value
-     * transformer to be installed reliably in reachability handler.
+     * Ensure that all reachability handlers that were present at the time the declaring type was
+     * marked as reachable are executed before accessing field values. This allows a field value
+     * transformer to be installed reliably in a reachability handler.
      */
     public void beforeFieldValueAccess() {
         declaringClass.registerAsReachable(this);

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

@@ -700,8 +700,9 @@ public <T> void registerObjectReachableCallback(ObjectReachableCallback<T> callb
         });
     }
 
-    public <T> void notifyObjectReachable(DuringAnalysisAccess access, T object, ScanReason reason) {
-        ConcurrentLightHashSet.forEach(this, objectReachableCallbacksUpdater, (ObjectReachableCallback<T> c) -> c.doCallback(access, object, reason));
+    public <T> void notifyObjectReachable(T object, ScanReason reason) {
+        ConcurrentLightHashSet.forEach(this, objectReachableCallbacksUpdater,
+                        (ObjectReachableCallback<T> c) -> c.doCallback(universe.getConcurrentAnalysisAccess(), object, reason));
     }
 
     public void registerInstantiatedCallback(Consumer<DuringAnalysisAccess> callback) {

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

@@ -811,6 +811,13 @@ protected void createAbstractImage(NativeImageKind k, List<HostedMethod> hostedE
     @SuppressWarnings("try")
     protected boolean runPointsToAnalysis(String imageName, OptionValues options, DebugContext debug) {
         try (Indent ignored = debug.logAndIndent("run analysis")) {
+            /*
+             * Set the ConcurrentAnalysisAccessImpl before Feature.beforeAnalysis is executed. Some
+             * features may already execute some pre-analysis tasks, e.g., reading a hosted field
+             * value, that can trigger reachability callbacks.
+             */
+            ConcurrentAnalysisAccessImpl concurrentConfig = new ConcurrentAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
+            aUniverse.setConcurrentAnalysisAccess(concurrentConfig);
             try (Indent ignored1 = debug.logAndIndent("process analysis initializers")) {
                 BeforeAnalysisAccessImpl config = new BeforeAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
                 ServiceCatalogSupport.singleton().enableServiceCatalogMapTransformer(config);
@@ -828,8 +835,6 @@ protected boolean runPointsToAnalysis(String imageName, OptionValues options, De
             try (ReporterClosable c = ProgressReporter.singleton().printAnalysis(bb.getUniverse(), nativeLibraries.getLibraries())) {
                 DuringAnalysisAccessImpl config = new DuringAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
                 try {
-                    ConcurrentAnalysisAccessImpl concurrentConfig = new ConcurrentAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
-                    aUniverse.setConcurrentAnalysisAccess(concurrentConfig);
                     if (ImageLayerBuildingSupport.buildingExtensionLayer()) {
                         /*
                          * All the field value transformers should be installed by this point.