[GR-24151] Reset BootLoader.CLASS_LOADER_VALUE_MAP.

PullRequest: graal/6451
wincc0823 · Jun 11, 2020 · 25c5fb3 · 25c5fb3
2 parents 8796c5c + 2fff6ad
commit 25c5fb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
@@ -879,6 +879,16 @@ private static URL findResource(String name) {
     private static Enumeration<URL> findResources(String name) throws IOException {
         return ClassLoader.getSystemClassLoader().getResources(name);
     }
+
+    /**
+     * All ClassLoaderValue are reset at run time for now. See also
+     * {@link Target_java_lang_ClassLoader#classLoaderValueMap} for resetting of individual class
+     * loaders.
+     */
+    // Checkstyle: stop
+    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = ConcurrentHashMap.class)//
+    static ConcurrentHashMap<?, ?> CLASS_LOADER_VALUE_MAP;
+    // Checkstyle: resume
 }
 
 /** Dummy class to have a class with the file's name. */

diff --git a/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java b/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
@@ -251,9 +251,14 @@ Class<?> loadClass(Target_java_lang_Module module, String name) {
         return ClassForNameSupport.forNameOrNull(name, false);
     }
 
+    /**
+     * All ClassLoaderValue are reset at run time for now. See also
+     * {@link Target_jdk_internal_loader_BootLoader#CLASS_LOADER_VALUE_MAP} for resetting of the
+     * boot class loader.
+     */
     @Alias @RecomputeFieldValue(kind = Kind.NewInstance, declClass = ConcurrentHashMap.class)//
     @TargetElement(onlyWith = JDK11OrLater.class)//
-    private ConcurrentHashMap<?, ?> classLoaderValueMap;
+    ConcurrentHashMap<?, ?> classLoaderValueMap;
 
     @Substitute //
     @TargetElement(onlyWith = JDK11OrLater.class) //