Merge JavaIOAccess and JavaLangAccess

Author: minborg

src/java.base/share/classes/java/io/Console.java

@@ -564,7 +564,7 @@ private static UnsupportedOperationException newUnsupportedOperationException()
     private static final Console cons = instantiateConsole();
     static {
         // Set up JavaIOAccess in SharedSecrets
-        SharedSecrets.setJavaIOAccess(new JavaIOAccess() {
+        SharedSecrets.set(JavaIOAccess.class, new JavaIOAccess() {
             public Console console() {
                 return cons;
             }

src/java.base/share/classes/java/io/DataInputStream.java

@@ -49,7 +49,7 @@
  * @since   1.0
  */
 public class DataInputStream extends FilterInputStream implements DataInput {
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+    private static final JavaLangAccess JLA = SharedSecrets.get(JavaLangAccess.class);
 
     private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
     private static final char[] EMPTY_CHAR_ARRAY = new char[0];

src/java.base/share/classes/java/io/DataOutputStream.java

@@ -52,7 +52,7 @@
  * @since   1.0
  */
 public class DataOutputStream extends FilterOutputStream implements DataOutput {
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+    private static final JavaLangAccess JLA = SharedSecrets.get(JavaLangAccess.class);
 
     /**
      * The number of bytes written to the data output stream so far.

src/java.base/share/classes/java/io/DeleteOnExitHook.java

@@ -26,6 +26,7 @@
 
 import java.util.*;
 
+import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
 
 /**
@@ -42,7 +43,7 @@ class DeleteOnExitHook {
         // delete-on-exit list and cause the DeleteOnExitHook to be
         // registered during shutdown in progress. So set the
         // registerShutdownInProgress parameter to true.
-        SharedSecrets.getJavaLangAccess()
+        SharedSecrets.get(JavaLangAccess.class)
             .registerShutdownHook(2 /* Shutdown hook invocation order */,
                 true /* register even if shutdown in progress */,
                 new Runnable() {

src/java.base/share/classes/java/io/ObjectInputStream.java

@@ -2851,7 +2851,7 @@ private class BlockDataInputStream
         /** readBlockHeader() return value indicating header read may block */
         private static final int HEADER_BLOCKED = -2;
         /** access to internal methods to count ASCII and inflate latin1/ASCII bytes to char */
-        private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+        private static final JavaLangAccess JLA = SharedSecrets.get(JavaLangAccess.class);
 
         /** buffer for reading general/block data */
         private final byte[] buf = new byte[MAX_BLOCK_SIZE];

src/java.base/share/classes/java/io/ObjectOutputStream.java

@@ -174,7 +174,7 @@
 public class ObjectOutputStream
     extends OutputStream implements ObjectOutput, ObjectStreamConstants
 {
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+    private static final JavaLangAccess JLA = SharedSecrets.get(JavaLangAccess.class);
 
     /** filter stream for handling block data conversion */
     private final BlockDataOutputStream bout;

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

@@ -47,18 +47,13 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.security.ProtectionDomain;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.function.Supplier;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
+import jdk.internal.access.JavaIOAccess;
 import jdk.internal.javac.Restricted;
 import jdk.internal.loader.NativeLibraries;
 import jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder;
@@ -234,8 +229,6 @@ public static void setErr(PrintStream err) {
         setErr0(err);
     }
 
-    private static volatile Console cons;
-
     /**
      * Returns the unique {@link Console Console} object associated
      * with the current Java virtual machine, if any.
@@ -246,15 +239,7 @@ public static void setErr(PrintStream err) {
      * @since   1.6
      */
      public static Console console() {
-         Console c;
-         if ((c = cons) == null) {
-             synchronized (System.class) {
-                 if ((c = cons) == null) {
-                     cons = c = SharedSecrets.getJavaIOAccess().console();
-                 }
-             }
-         }
-         return c;
+         return SharedSecrets.get(JavaIOAccess.class).console();
      }
 
     /**
@@ -1994,7 +1979,7 @@ private static void initPhase3() {
 
     private static void setJavaLangAccess() {
         // Allow privileged classes outside of java.lang
-        SharedSecrets.setJavaLangAccess(new JavaLangAccess() {
+        SharedSecrets.set(JavaLangAccess.class, new JavaLangAccess() {
             public List<Method> getDeclaredPublicMethods(Class<?> klass, String name, Class<?>... parameterTypes) {
                 return klass.getDeclaredPublicMethods(name, parameterTypes);
             }

src/java.base/share/classes/java/lang/foreign/SymbolLookup.java

@@ -255,7 +255,7 @@ static SymbolLookup loaderLookup() {
         return name -> {
             Objects.requireNonNull(name);
             if (Utils.containsNullChars(name)) return Optional.empty();
-            JavaLangAccess javaLangAccess = SharedSecrets.getJavaLangAccess();
+            JavaLangAccess javaLangAccess = SharedSecrets.get(JavaLangAccess.class);
             // note: ClassLoader::findNative supports a null loader
             NativeLibraries nativeLibraries = javaLangAccess.nativeLibrariesFor(loader);
             long addr = nativeLibraries.find(name);

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

@@ -25,6 +25,7 @@
 
 package java.lang.invoke;
 
+import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.misc.VM;
@@ -360,7 +361,7 @@ public static <T> T classData(Lookup caller, String name, Class<T> type) throws
      */
     static Object classData(Class<?> c) {
         UNSAFE.ensureClassInitialized(c);
-        return SharedSecrets.getJavaLangAccess().classData(c);
+        return SharedSecrets.get(JavaLangAccess.class).classData(c);
     }
 
     /**
@@ -2352,7 +2353,7 @@ Class<?> defineClass(boolean initialize, Object classData) {
                 ProtectionDomain pd = (loader != null) ? lookup.lookupClassProtectionDomain() : null;
                 Class<?> c = null;
                 try {
-                    c = SharedSecrets.getJavaLangAccess()
+                    c = SharedSecrets.get(JavaLangAccess.class)
                             .defineClass(loader, lookupClass, internalName, bytes, pd, initialize, classFlags, classData);
                     assert !isNestmate() || c.getNestHost() == lookupClass.getNestHost();
                     return c;
@@ -2392,7 +2393,7 @@ private boolean isNestmate() {
         private ProtectionDomain lookupClassProtectionDomain() {
             ProtectionDomain pd = cachedProtectionDomain;
             if (pd == null) {
-                cachedProtectionDomain = pd = SharedSecrets.getJavaLangAccess().protectionDomain(lookupClass);
+                cachedProtectionDomain = pd = SharedSecrets.get(JavaLangAccess.class).protectionDomain(lookupClass);
             }
             return pd;
         }

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

@@ -148,7 +148,7 @@ public final class StringConcatFactory {
      */
     private static final int MAX_INDY_CONCAT_ARG_SLOTS = 200;
 
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+    private static final JavaLangAccess JLA = SharedSecrets.get(JavaLangAccess.class);
 
     // StringConcatFactory bootstrap methods are startup sensitive, and may be
     // special cased in java.lang.invoke.BootstrapMethodInvoker to ensure