Avoid call to VM::isModuleSystemInited

Use initial error stream
mcimadamore · May 13, 2024 · c4938dc · c4938dc
1 parent d9fe9a7
commit c4938dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
@@ -66,7 +66,9 @@
 import jdk.internal.loader.ClassLoaders;
 import jdk.internal.misc.CDS;
 import jdk.internal.misc.Unsafe;
+import jdk.internal.misc.VM;
 import jdk.internal.module.ModuleBootstrap;
+import jdk.internal.module.ModuleBootstrap.IllegalNativeAccess;
 import jdk.internal.module.ModuleLoaderMap;
 import jdk.internal.module.ServicesCatalog;
 import jdk.internal.module.Resources;

diff --git a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
@@ -112,14 +112,15 @@ public static void ensureMemberAccess(Class<?> currentClass,
 
     @ForceInline
     public static void ensureNativeAccess(Class<?> currentClass, Class<?> owner, String methodName) {
-        if (VM.isModuleSystemInited()) {
-            // if there is no caller class, act as if the call came from unnamed module of system class loader
-            Module module = currentClass != null ?
-                    currentClass.getModule() :
-                    ClassLoader.getSystemClassLoader().getUnnamedModule();
-            class Holder {
-                static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
-            }
+        // if there is no caller class, act as if the call came from unnamed module of system class loader
+        Module module = currentClass != null ?
+                currentClass.getModule() :
+                ClassLoader.getSystemClassLoader().getUnnamedModule();
+        class Holder {
+            static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+        }
+        if (module != null) {
+            // not in init phase
             Holder.JLA.ensureNativeAccess(module, owner, methodName, currentClass);
         }
     }