fixes after rebase

cloudhubs · Oct 20, 2024 · 429f427 · 429f427
1 parent 948ba17
commit 429f427
Show file tree

Hide file tree

Showing 4 changed files with 216 additions and 191 deletions.
diff --git a/...acle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java b/...acle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java
@@ -29,6 +29,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -53,6 +53,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.StringJoiner;

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/prophet/ProphetPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/prophet/ProphetPlugin.java
@@ -13,8 +13,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.graalvm.compiler.options.Option;
-
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.svm.core.option.HostedOptionKey;
@@ -26,6 +24,8 @@
 import com.oracle.svm.hosted.prophet.model.Name;
 import com.oracle.svm.hosted.prophet.model.RestCall;
 
+import jdk.graal.compiler.options.Option;
+
 public class ProphetPlugin {
 
     private final ImageClassLoader loader;