Refactor iterative analysis code to common method

Extract the iteratively analyzing code from NativeImageGenerator to
PointsToAnalysis so it can be used by both native image generation and
standalone pointsto analysis.

Author: ziyilin

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

@@ -43,6 +43,10 @@
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicLongArray;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 import com.oracle.graal.pointsto.flow.FieldTypeFlow;
 import com.oracle.graal.pointsto.reports.StatisticsPrinter;
@@ -703,6 +707,61 @@ public HostVM getHostVM() {
         return hostVM;
     }
 
+    /**
+     * Iterate until analysis reaches a fixpoint.
+     *
+     *
+     * @param debug debug context
+     * @param duringAnalysisAction  The action handler taken during analysis, return true if no more iteration is required.
+     *                              It could be the {@link org.graalvm.nativeimage.hosted.Feature#duringAnalysis}
+     *                              for Native Image generation, but also can be other similar actions for standalone pointsto
+     *                              analysis that does not dependent on {@link com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl}
+     *                              and {@link com.oracle.svm.hosted.NativeImageGenerator.AnalysisFeatureHandler}.
+     * @return The error message during the analysis. If the analysis ends successfully, an empty String is returned, otherwise
+     * the actual error message is returned.
+     * @throws InterruptedException
+     */
+    @SuppressWarnings("try")
+    public String iterativelyAnalyze(DebugContext debug, Function<AnalysisUniverse, Boolean> duringAnalysisAction) throws InterruptedException {
+        int numIterations = 0;
+        while (true) {
+            try (Indent indent2 = debug.logAndIndent("new analysis iteration")) {
+                /*
+                 * Do the analysis (which itself is done in a similar iterative process)
+                 */
+                boolean analysisChanged = finish();
+
+                numIterations++;
+                if (numIterations > 1000) {
+                    /*
+                     * Usually there are < 10 iterations. If we have so many iterations, we
+                     * probably have an endless loop (but at least we have a performance
+                     * problem because we re-start the analysis so often).
+                     */
+                    return String.format("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
+                                    "The analysis itself %s find a change in type states in the last iteration.",
+                            numIterations, analysisChanged ? "DID" : "DID NOT");
+
+                }
+
+                /*
+                 * Allow features to change the universe.
+                 */
+                try (StopTimer t2 = getProcessFeaturesTimer().start()) {
+                    int numTypes = universe.getTypes().size();
+                    int numMethods = universe.getMethods().size();
+                    int numFields = universe.getFields().size();
+                    if (duringAnalysisAction.apply(universe)) {
+                        if (numTypes != universe.getTypes().size() || numMethods != universe.getMethods().size() || numFields != universe.getFields().size()) {
+                            return "When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()";
+                        }
+                        return "";
+                    }
+                }
+            }
+        }
+    }
+
     @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "ForkJoinPool does support null for the exception handler.")
     public static ForkJoinPool createExecutor(DebugContext debug, int numberOfThreads) {
         ForkJoinPool.ForkJoinWorkerThreadFactory factory = debugThreadFactory(debug.areScopesEnabled() || debug.areMetricsEnabled() ? debug : null);

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

@@ -55,6 +55,7 @@
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -690,51 +691,15 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
             }
 
             try (StopTimer t = bb.getAnalysisTimer().start()) {
-
-                /*
-                 * Iterate until analysis reaches a fixpoint.
-                 */
                 DuringAnalysisAccessImpl config = new DuringAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
-                int numIterations = 0;
-                while (true) {
-                    try (Indent indent2 = debug.logAndIndent("new analysis iteration")) {
-                        /*
-                         * Do the analysis (which itself is done in a similar iterative process)
-                         */
-                        boolean analysisChanged = bb.finish();
-
-                        numIterations++;
-                        if (numIterations > 1000) {
-                            /*
-                             * Usually there are < 10 iterations. If we have so many iterations, we
-                             * probably have an endless loop (but at least we have a performance
-                             * problem because we re-start the analysis so often).
-                             */
-                            throw UserError.abort("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
-                                            "The analysis itself %s find a change in type states in the last iteration.",
-                                            numIterations, analysisChanged ? "DID" : "DID NOT");
-                        }
-
-                        /*
-                         * Allow features to change the universe.
-                         */
-                        try (StopTimer t2 = bb.getProcessFeaturesTimer().start()) {
-                            int numTypes = aUniverse.getTypes().size();
-                            int numMethods = aUniverse.getMethods().size();
-                            int numFields = aUniverse.getFields().size();
-
+                String msg = ((NativeImagePointsToAnalysis) bb).iterativelyAnalyze(debug,
+                        (aUniverse) -> {
                             bb.getHostVM().notifyClassReachabilityListener(aUniverse, config);
                             featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
-
-                            if (!config.getAndResetRequireAnalysisIteration()) {
-                                if (numTypes != aUniverse.getTypes().size() || numMethods != aUniverse.getMethods().size() || numFields != aUniverse.getFields().size()) {
-                                    throw UserError.abort(
-                                                    "When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()");
-                                }
-                                break;
-                            }
-                        }
-                    }
+                            return !config.getAndResetRequireAnalysisIteration();
+                        });
+                if (msg.length() > 0) {
+                    throw UserError.abort(msg);
                 }
                 assert verifyAssignableTypes(imageName);
 
@@ -779,6 +744,8 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
         return false;
     }
 
+
+
     @SuppressWarnings("try")
     private boolean verifyAssignableTypes(String imageName) {
         /*