[GR-68395] Fix -H:TrackDynamicAccess=all collecting unwanted class and module path entries

PullRequest: graal/21728

Author: jormundur00

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

@@ -108,7 +108,6 @@ public ConcurrentLinkedQueue<String> getMethodCallLocations(String methodName) {
                     "java.lang.ClassLoader.loadClass",
                     "java.lang.foreign.Linker.nativeLinker");
 
-    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";

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

@@ -1180,14 +1180,8 @@ public void setPreserveAll(ValueWithOrigin<String> valueWithOrigin) {
 
     public void setTrackAllDynamicAccess(ValueWithOrigin<String> valueWithOrigin) {
         var origin = new IncludeOptionsSupport.ExtendedOptionWithOrigin(new IncludeOptionsSupport.ExtendedOption("", DynamicAccessDetectionFeature.TRACK_ALL), valueWithOrigin);
-        classpath().stream()
-                        .map(Path::toString)
-                        .filter(path -> !path.contains(DynamicAccessDetectionFeature.GRAAL_SUBPATH))
-                        .forEach(entry -> dynamicAccessSelectors.addClassPathEntry(entry, origin));
-        modulepath().stream()
-                        .map(Path::toString)
-                        .filter(path -> !path.contains(DynamicAccessDetectionFeature.GRAAL_SUBPATH))
-                        .forEach(entry -> dynamicAccessSelectors.addModule(entry, origin));
+        getModulePathsFinder().findAll().forEach(m -> dynamicAccessSelectors.addModule(m.descriptor().name(), origin));
+        dynamicAccessSelectors.addModule(ALL_UNNAMED, origin);
     }
 
     public Stream<Class<?>> getClassesToIncludeUnconditionally() {