fixes after rebase

cloudhubs · Sep 8, 2023 · 7605ebd · 7605ebd
1 parent f94e275
commit 7605ebd
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 331 deletions.
diff --git a/...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -1232,7 +1232,6 @@ public ResolvedJavaMethod[] getDeclaredMethods() {
 
     @Override
     public AnalysisMethod[] getDeclaredMethods(boolean forceLink) {
-        GraalError.guarantee(forceLink == false, "only use getDeclaredMethods without forcing to link, because linking can throw LinkageError");
         return universe.lookup(wrapped.getDeclaredMethods(forceLink));
     }
 
@@ -1243,7 +1242,6 @@ public ResolvedJavaMethod[] getDeclaredConstructors() {
 
     @Override
     public AnalysisMethod[] getDeclaredConstructors(boolean forceLink) {
-        GraalError.guarantee(forceLink == false, "only use getDeclaredConstructors without forcing to link, because linking can throw LinkageError");
         return universe.lookup(wrapped.getDeclaredConstructors(forceLink));
     }
 

diff --git a/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -45,7 +45,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import com.oracle.svm.hosted.prophet.ProphetPlugin;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.core.riscv64.ShadowedRISCV64;
 import org.graalvm.compiler.debug.DebugContext;
@@ -78,6 +77,7 @@
 import com.oracle.svm.hosted.code.CEntryPointData;
 import com.oracle.svm.hosted.image.AbstractImage.NativeImageKind;
 import com.oracle.svm.hosted.option.HostedOptionParser;
+import com.oracle.svm.hosted.prophet.ProphetPlugin;
 import com.oracle.svm.util.ClassUtil;
 import com.oracle.svm.util.LogUtils;
 import com.oracle.svm.util.ModuleSupport;
@@ -531,9 +531,6 @@ private int buildImage(ImageClassLoader classLoader) {
                     reporter.printStart(imageName, imageKind);
                 }
 
-                int maxConcurrentThreads = NativeImageOptions.getMaximumNumberOfConcurrentThreads(parsedHostedOptions);
-                analysisExecutor = NativeImagePointsToAnalysis.createExecutor(debug, NativeImageOptions.getMaximumNumberOfAnalysisThreads(parsedHostedOptions));
-                compilationExecutor = NativeImagePointsToAnalysis.createExecutor(debug, maxConcurrentThreads);
                 /*
                  * Since the main thread helps to process analysis and compilation tasks (see use of
                  * awaitQuiescence() in CompletionExecutor), subtract one to determine the number of