[GR-30433] Always parse graphs with unresolvedIsError set to false.

PullRequest: graal/16298

Author: Christian Wimmer

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java

@@ -24,10 +24,11 @@
  */
 package com.oracle.graal.pointsto.api;
 
-import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere;
 import static jdk.graal.compiler.options.OptionType.Expert;
+import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere;
 
 import org.graalvm.collections.EconomicMap;
+
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionKey;
 
@@ -131,8 +132,8 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
     @Option(help = "Allow a type flow state to contain types not compatible with its declared type.")//
     public static final OptionKey<Boolean> RelaxTypeFlowStateConstraints = new OptionKey<>(true);
 
-    @Option(help = "Report unresolved elements as errors.")//
-    public static final OptionKey<Boolean> UnresolvedIsError = new OptionKey<>(true);
+    @Option(help = "Deprecated, option no longer has any effect.", deprecated = true)//
+    static final OptionKey<Boolean> UnresolvedIsError = new OptionKey<>(true);
 
     @Option(help = "Report analysis statistics.")//
     public static final OptionKey<Boolean> PrintPointsToStatistics = new OptionKey<>(false);

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java

@@ -24,6 +24,14 @@
  */
 package com.oracle.graal.pointsto.flow;
 
+import com.oracle.graal.pointsto.BigBang;
+import com.oracle.graal.pointsto.api.HostVM;
+import com.oracle.graal.pointsto.infrastructure.GraphProvider.Purpose;
+import com.oracle.graal.pointsto.meta.AnalysisMethod;
+import com.oracle.graal.pointsto.phases.SubstrateIntrinsicGraphBuilder;
+import com.oracle.graal.pointsto.util.AnalysisError;
+import com.oracle.svm.util.ClassUtil;
+
 import jdk.graal.compiler.api.runtime.GraalJVMCICompiler;
 import jdk.graal.compiler.bytecode.Bytecode;
 import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode;
@@ -42,16 +50,6 @@
 import jdk.graal.compiler.phases.OptimisticOptimizations;
 import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 import jdk.graal.compiler.runtime.RuntimeProvider;
-
-import com.oracle.graal.pointsto.BigBang;
-import com.oracle.graal.pointsto.api.HostVM;
-import com.oracle.graal.pointsto.api.PointstoOptions;
-import com.oracle.graal.pointsto.infrastructure.GraphProvider.Purpose;
-import com.oracle.graal.pointsto.meta.AnalysisMethod;
-import com.oracle.graal.pointsto.phases.SubstrateIntrinsicGraphBuilder;
-import com.oracle.graal.pointsto.util.AnalysisError;
-import com.oracle.svm.util.ClassUtil;
-
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.runtime.JVMCI;
 
@@ -136,7 +134,7 @@ public static AnalysisParsedGraph parseBytecode(BigBang bb, AnalysisMethod metho
 
                     GraphBuilderConfiguration config = GraphBuilderConfiguration.getDefault(bb.getProviders(method).getGraphBuilderPlugins())
                                     .withEagerResolving(true)
-                                    .withUnresolvedIsError(PointstoOptions.UnresolvedIsError.getValue(bb.getOptions()))
+                                    .withUnresolvedIsError(false)
                                     .withNodeSourcePosition(true)
                                     .withBytecodeExceptionMode(BytecodeExceptionMode.CheckAll)
                                     .withRetainLocalVariables(true);

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java

@@ -53,7 +53,6 @@
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.HostVM;
-import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.flow.InvokeTypeFlow;
 import com.oracle.graal.pointsto.flow.MethodFlowsGraph;
 import com.oracle.graal.pointsto.heap.ImageHeapScanner;
@@ -282,7 +281,9 @@ static RuntimeGraphBuilderPhase createRuntimeGraphBuilderPhase(BigBang bb, Provi
                         GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts) {
 
             // Adjust graphbuilderconfig to match analysis phase
-            var newGraphBuilderConfig = graphBuilderConfig.withEagerResolving(true).withUnresolvedIsError(PointstoOptions.UnresolvedIsError.getValue(bb.getOptions()));
+            var newGraphBuilderConfig = graphBuilderConfig
+                            .withEagerResolving(true)
+                            .withUnresolvedIsError(false);
             return new RuntimeGraphBuilderPhase(providers, newGraphBuilderConfig, optimisticOpts, null, providers.getWordTypes(), (SVMHost) bb.getHostVM());
         }
 

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

@@ -328,9 +328,9 @@ public boolean isInitialized(AnalysisType type) {
 
     @Override
     public GraphBuilderConfiguration updateGraphBuilderConfiguration(GraphBuilderConfiguration config, AnalysisMethod method) {
-        GraphBuilderConfiguration updatedConfig = config.withRetainLocalVariables(retainLocalVariables()).withUnresolvedIsError(linkAtBuildTimeSupport.linkAtBuildTime(method.getDeclaringClass()))
-                        .withFullInfopoints(
-                                        SubstrateOptions.getSourceLevelDebug() && SubstrateOptions.getSourceLevelDebugFilter().test(method.getDeclaringClass().toJavaName()));
+        GraphBuilderConfiguration updatedConfig = config
+                        .withRetainLocalVariables(retainLocalVariables())
+                        .withFullInfopoints(SubstrateOptions.getSourceLevelDebug() && SubstrateOptions.getSourceLevelDebugFilter().test(method.getDeclaringClass().toJavaName()));
         if (parsingSupport != null) {
             return parsingSupport.updateGraphBuilderConfiguration(updatedConfig, method);
         }