Update points-to analyzer.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java

@@ -26,8 +26,6 @@
 
 package com.oracle.graal.pointsto.standalone;
 
-import static jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
-
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -56,6 +54,7 @@
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.graal.pointsto.meta.PointsToAnalysisFactory;
 import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
+import com.oracle.graal.pointsto.plugins.PointstoGraphBuilderPlugins;
 import com.oracle.graal.pointsto.reports.AnalysisReporter;
 import com.oracle.graal.pointsto.standalone.features.StandaloneAnalysisFeatureImpl;
 import com.oracle.graal.pointsto.standalone.features.StandaloneAnalysisFeatureManager;
@@ -97,7 +96,6 @@ public final class PointsToAnalyzer {
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.text.spi");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.reflect.annotation");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.security.jca");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.jdeps", "com.sun.tools.classfile");
     }
 
     private final OptionValues options;
@@ -212,7 +210,9 @@ private PointsToAnalyzer(String mainEntryClass, OptionValues options) {
             NoClassInitializationPlugin classInitializationPlugin = new NoClassInitializationPlugin();
             plugins.setClassInitializationPlugin(classInitializationPlugin);
             aProviders.setGraphBuilderPlugins(plugins);
-            registerInvocationPlugins(originalProviders.getSnippetReflection(), plugins.getInvocationPlugins(), false, true, false);
+            PointstoGraphBuilderPlugins.registerArrayPlugins(plugins.getInvocationPlugins());
+            PointstoGraphBuilderPlugins.registerSystemPlugins(plugins.getInvocationPlugins());
+            PointstoGraphBuilderPlugins.registerObjectPlugins(plugins.getInvocationPlugins());
         }
     }
 
@@ -286,6 +286,7 @@ public int run() {
         try (Timer t = new Timer("analysis", analysisName)) {
             StandaloneAnalysisFeatureImpl.DuringAnalysisAccessImpl config = new StandaloneAnalysisFeatureImpl.DuringAnalysisAccessImpl(standaloneAnalysisFeatureManager, analysisClassLoader, bigbang,
                             debugContext);
+            bigbang.getUniverse().setConcurrentAnalysisAccess(config);
             bigbang.runAnalysis(debugContext, (analysisUniverse) -> {
                 bigbang.getHostVM().notifyClassReachabilityListener(analysisUniverse, config);
                 standaloneAnalysisFeatureManager.forEachFeature(feature -> feature.duringAnalysis(config));

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneObjectScanner.java

@@ -58,7 +58,13 @@ protected void scanEmbeddedRoot(JavaConstant root, Object position) {
     @Override
     protected final void scanField(AnalysisField field, JavaConstant receiver, ScanReason prevReason) {
         if (shouldScanField.test(field)) {
-            super.scanField(field, receiver, prevReason);
+            if (field.isStatic()) {
+                if (field.getDeclaringClass().isInitialized()) {
+                    super.scanField(field, receiver, prevReason);
+                }
+            } else {
+                super.scanField(field, receiver, prevReason);
+            }
         }
     }
 

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/heap/StandaloneImageHeapScanner.java

@@ -69,19 +69,26 @@ protected Class<?> getClass(String className) {
 
     @Override
     public ValueSupplier<JavaConstant> readHostedFieldValue(AnalysisField field, JavaConstant receiver) {
+        if (field.isStatic() && !field.getDeclaringClass().isInitialized()) {
+            return ValueSupplier.eagerValue(getConstantValue(field));
+        }
         ValueSupplier<JavaConstant> ret = super.readHostedFieldValue(field, receiver);
         if (ret.get() == null && field.isStatic()) {
-            ResolvedJavaField wrappedField = field.getWrapped();
-            JavaConstant constant = wrappedField.getConstantValue();
-            if (constant == null) {
-                constant = JavaConstant.defaultForKind(wrappedField.getJavaKind());
-            }
-            return ValueSupplier.eagerValue(constant);
+            return ValueSupplier.eagerValue(getConstantValue(field));
         } else {
             return ret;
         }
     }
 
+    private static JavaConstant getConstantValue(AnalysisField field) {
+        ResolvedJavaField wrappedField = field.getWrapped();
+        JavaConstant constant = wrappedField.getConstantValue();
+        if (constant == null) {
+            constant = JavaConstant.defaultForKind(wrappedField.getJavaKind());
+        }
+        return constant;
+    }
+
     @Override
     public void scanEmbeddedRoot(JavaConstant root, BytecodePosition position) {
         if (shouldScanConstant.test(root)) {