Make Dynamic access detection platform independent

Author: jormundur00

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

@@ -42,9 +42,9 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.collections.UnmodifiableEconomicSet;
 import org.graalvm.nativeimage.ImageSingletons;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;
@@ -107,15 +107,15 @@ public ConcurrentLinkedQueue<String> getMethodCallLocations(String methodName) {
                     "java.lang.reflect.Array.newInstance",
                     "java.lang.ClassLoader.loadClass");
 
-    public static final String GRAAL_SUBPATH = "/graal/";
+    public static final String GRAAL_SUBPATH = File.separator + "graal" + File.separator;
     public static final String TRACK_ALL = "all";
 
     private static final String OUTPUT_DIR_NAME = "dynamic-access";
     private static final String TRACK_NONE = "none";
     private static final String TO_CONSOLE = "to-console";
     private static final String NO_DUMP = "no-dump";
 
-    private UnmodifiableEconomicSet<String> sourceEntries; // Class path entries and module or
+    private EconomicSet<String> sourceEntries; // Class path entries and module or
     // package names
     private final Map<String, MethodsByAccessKind> callsBySourceEntry;
     private final Set<FoldEntry> foldEntries = ConcurrentHashMap.newKeySet();
@@ -144,12 +144,12 @@ public MethodsByAccessKind getMethodsByAccessKind(String entry) {
         return callsBySourceEntry.computeIfAbsent(entry, k -> new MethodsByAccessKind());
     }
 
-    public UnmodifiableEconomicSet<String> getSourceEntries() {
+    public EconomicSet<String> getSourceEntries() {
         return sourceEntries;
     }
 
     public static String getEntryName(String path) {
-        String fileName = path.substring(path.lastIndexOf("/") + 1);
+        String fileName = path.substring(path.lastIndexOf(File.separator) + 1);
         if (fileName.endsWith(".jar")) {
             fileName = fileName.substring(0, fileName.lastIndexOf('.'));
         }
@@ -321,6 +321,13 @@ public void afterRegistration(AfterRegistrationAccess access) {
     public void beforeCompilation(BeforeCompilationAccess access) {
         DynamicAccessDetectionFeature.instance().reportDynamicAccess();
         DynamicAccessDetectionPhase.clearMethodSignatures();
+        foldEntries.clear();
+    }
+
+    @Override
+    public void beforeHeapLayout(BeforeHeapLayoutAccess access) {
+        callsBySourceEntry.clear();
+        sourceEntries.clear();
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DynamicAccessDetectionPhase.java

@@ -36,8 +36,9 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.Signature;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.UnmodifiableEconomicSet;
+import org.graalvm.collections.EconomicSet;
 
+import java.io.File;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
@@ -245,14 +246,14 @@ private static MethodInfo getMethodInfo(ResolvedJavaMethod method) {
      * the value specified by the option, otherwise returns null.
      */
     private static String getSourceEntry(AnalysisType callerClass) {
-        UnmodifiableEconomicSet<String> sourceEntries = DynamicAccessDetectionFeature.instance().getSourceEntries();
+        EconomicSet<String> sourceEntries = DynamicAccessDetectionFeature.instance().getSourceEntries();
         try {
             CodeSource entryPathSource = callerClass.getJavaClass().getProtectionDomain().getCodeSource();
             if (entryPathSource != null) {
                 URL entryPathURL = entryPathSource.getLocation();
                 if (entryPathURL != null) {
                     String classPathEntry = entryPathURL.toURI().getPath();
-                    if (classPathEntry.endsWith("/")) {
+                    if (classPathEntry.endsWith(File.separator)) {
                         classPathEntry = classPathEntry.substring(0, classPathEntry.length() - 1);
                     }
                     if (sourceEntries.contains(classPathEntry)) {