Add JavaLangInvokeAccess

Author: minborg

src/java.base/share/classes/java/lang/ClassFrameInfo.java

@@ -38,7 +38,7 @@
  * @see StackWalker.Option#DROP_METHOD_INFO
  */
 class ClassFrameInfo implements StackFrame {
-    static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
+    static final JavaLangInvokeAccess JLIA = SharedSecrets.get(JavaLangInvokeAccess.class);
 
     Object classOrMemberName;    // Class or ResolvedMemberName initialized by VM
     int flags;                   // updated by VM to set hidden and caller-sensitive bits

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

@@ -1535,7 +1535,7 @@ private static NamedFunction createFunction(byte func) {
     }
 
     static {
-        SharedSecrets.setJavaLangInvokeAccess(new JavaLangInvokeAccess() {
+        SharedSecrets.set(JavaLangInvokeAccess.class, new JavaLangInvokeAccess() {
             @Override
             public Class<?> getDeclaringClass(Object rmname) {
                 ResolvedMethodName method = (ResolvedMethodName)rmname;

src/java.base/share/classes/jdk/internal/access/Access.java

@@ -1,4 +1,4 @@
 package jdk.internal.access;
 
-public sealed interface Access permits JavaIOAccess, JavaLangAccess {
+public sealed interface Access permits JavaIOAccess, JavaLangAccess, JavaLangInvokeAccess {
 }

src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java

@@ -38,7 +38,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public interface JavaLangInvokeAccess {
+public non-sealed interface JavaLangInvokeAccess extends Access {
     /**
      * Returns the declaring class for the given ResolvedMethodName.
      * Used by {@code StackFrameInfo}.

src/java.base/share/classes/jdk/internal/access/SharedSecrets.java

@@ -79,10 +79,11 @@ public final class SharedSecrets {
 
     // This map is used to associate a certain Access interface to another class where
     // the implementation of said interface resides
-    private static final Map<Class<? extends Access>, Class<?>> IMPLEMENTATIONS =
+    private static final Map<Class<? extends Access>, Object> IMPLEMENTATIONS =
             Map.ofEntries(
                     Map.entry(JavaIOAccess.class, Console.class),
-                    Map.entry(JavaLangAccess.class, System.class)
+                    Map.entry(JavaLangAccess.class, System.class),
+                    Map.entry(JavaLangInvokeAccess.class, "java.lang.invoke.MethodHandleImpl")
             );
 
     private static final StableComponentContainer<Access> COMPONENTS =
@@ -98,9 +99,12 @@ public static <T extends Access> T get(Class<T> clazz) {
 
     @DontInline
     private static <T extends Access> T getSlowPath(Class<T> clazz) {
-        Class<?> implementation = IMPLEMENTATIONS.get(clazz);
-        assert implementation != null;
-        ensureClassInitialized(implementation);
+        Object implementation = IMPLEMENTATIONS.get(clazz);
+        switch (implementation) {
+            case Class<?> c -> ensureClassInitialized(c);
+            case String s   -> ensureClassInitialized(s);
+            default         -> throw new InternalError("Should not reach here");
+        }
         // The component should now be initialized
         return COMPONENTS.get(clazz);
     }
@@ -113,7 +117,7 @@ public static <T extends Access> void set(Class<T> type, T access) {
     private static JavaAWTFontAccess javaAWTFontAccess;
     @Stable private static JavaBeansAccess javaBeansAccess;
 //    @Stable private static JavaLangAccess javaLangAccess;
-    @Stable private static JavaLangInvokeAccess javaLangInvokeAccess;
+//    @Stable private static JavaLangInvokeAccess javaLangInvokeAccess;
     @Stable private static JavaLangModuleAccess javaLangModuleAccess;
     @Stable private static JavaLangRefAccess javaLangRefAccess;
     @Stable private static JavaLangReflectAccess javaLangReflectAccess;
@@ -200,21 +204,6 @@ public static void setJavaUtilJarAccess(JavaUtilJarAccess access) {
         javaUtilJarAccess = access;
     }
 
-    public static void setJavaLangInvokeAccess(JavaLangInvokeAccess jlia) {
-        javaLangInvokeAccess = jlia;
-    }
-
-    public static JavaLangInvokeAccess getJavaLangInvokeAccess() {
-        var access = javaLangInvokeAccess;
-        if (access == null) {
-            try {
-                Class.forName("java.lang.invoke.MethodHandleImpl", true, null);
-                access = javaLangInvokeAccess;
-            } catch (ClassNotFoundException e) {}
-        }
-        return access;
-    }
-
     public static void setJavaLangModuleAccess(JavaLangModuleAccess jlrma) {
         javaLangModuleAccess = jlrma;
     }
@@ -516,6 +505,12 @@ public static JavaxSecurityAccess getJavaxSecurityAccess() {
     private static void ensureClassInitialized(Class<?> c) {
         try {
             MethodHandles.lookup().ensureInitialized(c);
-        } catch (IllegalAccessException e) {}
+        } catch (IllegalAccessException _) {}
+    }
+
+    private static void ensureClassInitialized(String className) {
+        try {
+            Class.forName(className, true, null);
+        } catch (ClassNotFoundException _) {}
     }
 }

src/java.base/share/classes/jdk/internal/foreign/Utils.java

@@ -25,6 +25,7 @@
 
 package jdk.internal.foreign;
 
+import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.foreign.abi.SharedUtils;
 import jdk.internal.misc.Unsafe;
@@ -138,7 +139,7 @@ private static VarHandle makeRawSegmentViewVarHandleInternal(MemoryLayout enclos
             baseCarrier = ADDRESS_CARRIER_TYPE;
         }
 
-        VarHandle handle = SharedSecrets.getJavaLangInvokeAccess().memorySegmentViewHandle(baseCarrier,
+        VarHandle handle = SharedSecrets.get(JavaLangInvokeAccess.class).memorySegmentViewHandle(baseCarrier,
                 enclosing, layout.byteAlignment() - 1, layout.order(), constantOffset, offset);
 
         if (layout instanceof AddressLayout addressLayout) {

src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java

@@ -50,7 +50,7 @@ public class DowncallLinker {
     private static final boolean USE_SPEC = Boolean.parseBoolean(
             System.getProperty("jdk.internal.foreign.DowncallLinker.USE_SPEC", "true"));
 
-    private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
+    private static final JavaLangInvokeAccess JLIA = SharedSecrets.get(JavaLangInvokeAccess.class);
 
     private static final MethodHandle MH_INVOKE_INTERP_BINDINGS = MhUtil.findVirtual(
             MethodHandles.lookup(), DowncallLinker.class, "invokeInterpBindings",

src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java

@@ -72,7 +72,7 @@ public final class SharedUtils {
     private SharedUtils() {
     }
 
-    private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
+    private static final JavaLangInvokeAccess JLIA = SharedSecrets.get(JavaLangInvokeAccess.class);
 
     private static final MethodHandle MH_ALLOC_BUFFER;
     private static final MethodHandle MH_BUFFER_COPY;

src/java.base/share/classes/jdk/internal/misc/CDS.java

@@ -42,6 +42,7 @@
 import java.util.jar.JarFile;
 import java.util.stream.Stream;
 
+import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.StaticProperty;
 
@@ -235,7 +236,7 @@ private static Object[] generateLambdaFormHolderClasses(String[] lines) {
         Objects.requireNonNull(lines);
         validateInputLines(lines);
         Stream<String> lineStream = Arrays.stream(lines);
-        Map<String, byte[]> result = SharedSecrets.getJavaLangInvokeAccess().generateHolderClasses(lineStream);
+        Map<String, byte[]> result = SharedSecrets.get(JavaLangInvokeAccess.class).generateHolderClasses(lineStream);
         int size = result.size();
         Object[] retArray = new Object[size * 2];
         int index = 0;

src/java.base/share/classes/jdk/internal/reflect/DirectMethodHandleAccessor.java

@@ -311,7 +311,7 @@ static Object invoke(MethodHandle target, Class<?> caller, Object obj, Object[]
                 }
             }
 
-            static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
+            static final JavaLangInvokeAccess JLIA = SharedSecrets.get(JavaLangInvokeAccess.class);
             static final MethodHandle NATIVE_ACCESSOR_INVOKE = MhUtil.findVirtual(
                     MethodHandles.lookup(), NativeAccessor.class, "invoke",
                     genericMethodType(1, true));