8253500: [REDO] JDK-8253208 Move CDS related code to a separate class

yminqi · yminqi · commit 89c5e49ba2fd · 2020-09-24T15:28:10.000Z
Reviewed-by: mchung, iklam
diff --git a/make/hotspot/symbols/symbols-unix b/make/hotspot/symbols/symbols-unix
@@ -123,7 +123,7 @@ JVM_GetPermittedSubclasses
 JVM_GetPrimitiveArrayElement
 JVM_GetProperties
 JVM_GetProtectionDomain
-JVM_GetRandomSeedForCDSDump
+JVM_GetRandomSeedForDumping
 JVM_GetRecordComponents
 JVM_GetSimpleBinaryName
 JVM_GetStackAccessControlContext
@@ -143,8 +143,8 @@ JVM_InternString
 JVM_Interrupt
 JVM_InvokeMethod
 JVM_IsArrayClass
-JVM_IsCDSDumpingEnabled
-JVM_IsCDSSharingEnabled
+JVM_IsDynamicDumpingEnabled
+JVM_IsSharingEnabled
 JVM_IsConstructorIx
 JVM_IsHiddenClass
 JVM_IsInterface
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
@@ -198,13 +198,13 @@ JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env, jclass caller,
                                       jboolean initialize);
 
 JNIEXPORT jboolean JNICALL
-JVM_IsCDSDumpingEnabled(JNIEnv* env);
+JVM_IsDynamicDumpingEnabled(JNIEnv* env);
 
 JNIEXPORT jboolean JNICALL
-JVM_IsCDSSharingEnabled(JNIEnv* env);
+JVM_IsSharingEnabled(JNIEnv* env);
 
 JNIEXPORT jlong JNICALL
-JVM_GetRandomSeedForCDSDump();
+JVM_GetRandomSeedForDumping();
 
 /*
  * java.lang.Throwable
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
@@ -3833,18 +3833,18 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
 #endif // INCLUDE_CDS
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsCDSDumpingEnabled(JNIEnv* env))
-    JVMWrapper("JVM_IsCDSDumpingEnable");
+JVM_ENTRY(jboolean, JVM_IsDynamicDumpingEnabled(JNIEnv* env))
+    JVMWrapper("JVM_IsDynamicDumpingEnable");
     return DynamicDumpSharedSpaces;
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsCDSSharingEnabled(JNIEnv* env))
-    JVMWrapper("JVM_IsCDSSharingEnable");
+JVM_ENTRY(jboolean, JVM_IsSharingEnabled(JNIEnv* env))
+    JVMWrapper("JVM_IsSharingEnable");
     return UseSharedSpaces;
 JVM_END
 
-JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForCDSDump())
-  JVMWrapper("JVM_GetRandomSeedForCDSDump");
+JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForDumping())
+  JVMWrapper("JVM_GetRandomSeedForDumping");
   if (DumpSharedSpaces) {
     const char* release = Abstract_VM_Version::vm_release();
     const char* dbg_level = Abstract_VM_Version::jdk_debug_level();
@@ -3859,7 +3859,7 @@ JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForCDSDump())
     if (seed == 0) { // don't let this ever be zero.
       seed = 0x87654321;
     }
-    log_debug(cds)("JVM_GetRandomSeedForCDSDump() = " JLONG_FORMAT, seed);
+    log_debug(cds)("JVM_GetRandomSeedForDumping() = " JLONG_FORMAT, seed);
     return seed;
   } else {
     return 0;
diff --git a/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java
@@ -26,7 +26,7 @@
 package java.lang;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 import java.lang.constant.Constable;
 import java.lang.constant.DynamicConstantDesc;
@@ -108,7 +108,7 @@ private ByteCache() {}
             final int size = -(-128) + 127 + 1;
 
             // Load and use the archived cache if it exists
-            VM.initializeFromArchive(ByteCache.class);
+            CDS.initializeFromArchive(ByteCache.class);
             if (archivedCache == null || archivedCache.length != size) {
                 Byte[] c = new Byte[size];
                 byte value = (byte)-128;
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
@@ -26,7 +26,7 @@
 package java.lang;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 import java.lang.constant.Constable;
 import java.lang.constant.DynamicConstantDesc;
@@ -8516,7 +8516,7 @@ private CharacterCache(){}
             int size = 127 + 1;
 
             // Load and use the archived cache if it exists
-            VM.initializeFromArchive(CharacterCache.class);
+            CDS.initializeFromArchive(CharacterCache.class);
             if (archivedCache == null || archivedCache.length != size) {
                 Character[] c = new Character[size];
                 for (int i = 0; i < size; i++) {
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
@@ -33,6 +33,7 @@
 import java.util.Optional;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.misc.CDS;
 import jdk.internal.misc.VM;
 
 import static java.lang.String.COMPACT_STRINGS;
@@ -1023,7 +1024,7 @@ private static class IntegerCache {
             high = h;
 
             // Load IntegerCache.archivedCache from archive, if possible
-            VM.initializeFromArchive(IntegerCache.class);
+            CDS.initializeFromArchive(IntegerCache.class);
             int size = (high - low) + 1;
 
             // Use the archived cache if it exists and is large enough
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
@@ -34,7 +34,7 @@
 import java.util.Optional;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 import static java.lang.String.COMPACT_STRINGS;
 import static java.lang.String.LATIN1;
@@ -1169,7 +1169,7 @@ private LongCache() {}
             int size = -(-128) + 127 + 1;
 
             // Load and use the archived cache if it exists
-            VM.initializeFromArchive(LongCache.class);
+            CDS.initializeFromArchive(LongCache.class);
             if (archivedCache == null || archivedCache.length != size) {
                 Long[] c = new Long[size];
                 long value = -128;
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
@@ -55,6 +55,7 @@
 import jdk.internal.loader.BuiltinClassLoader;
 import jdk.internal.loader.BootLoader;
 import jdk.internal.loader.ClassLoaders;
+import jdk.internal.misc.CDS;
 import jdk.internal.misc.VM;
 import jdk.internal.module.IllegalAccessLogger;
 import jdk.internal.module.ModuleLoaderMap;
@@ -277,7 +278,7 @@ static ArchivedData get() {
         }
 
         static {
-            VM.initializeFromArchive(ArchivedData.class);
+            CDS.initializeFromArchive(ArchivedData.class);
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java
@@ -26,7 +26,7 @@
 package java.lang;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 import java.lang.constant.Constable;
 import java.lang.constant.DynamicConstantDesc;
@@ -234,7 +234,7 @@ private ShortCache() {}
             int size = -(-128) + 127 + 1;
 
             // Load and use the archived cache if it exists
-            VM.initializeFromArchive(ShortCache.class);
+            CDS.initializeFromArchive(ShortCache.class);
             if (archivedCache == null || archivedCache.length != size) {
                 Short[] c = new Short[size];
                 short value = -128;
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java b/src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java
@@ -26,15 +26,15 @@
 package java.lang.invoke;
 
 import jdk.internal.loader.BuiltinClassLoader;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 final class LambdaProxyClassArchive {
     private static final boolean dumpArchive;
     private static final boolean sharingEnabled;
 
     static {
-        dumpArchive = VM.isCDSDumpingEnabled();
-        sharingEnabled = VM.isCDSSharingEnabled();
+        dumpArchive = CDS.isDynamicDumpingEnabled();
+        sharingEnabled = CDS.isSharingEnabled();
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/module/Configuration.java b/src/java.base/share/classes/java/lang/module/Configuration.java
@@ -41,7 +41,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 import jdk.internal.module.ModuleReferenceImpl;
 import jdk.internal.module.ModuleTarget;
 import jdk.internal.vm.annotation.Stable;
@@ -110,7 +110,7 @@ public final class Configuration {
 
     static {
         // Initialize EMPTY_CONFIGURATION from the archive.
-        VM.initializeFromArchive(Configuration.class);
+        CDS.initializeFromArchive(Configuration.class);
         // Create a new empty Configuration if there is no archived version.
         if (EMPTY_CONFIGURATION == null) {
             EMPTY_CONFIGURATION = new Configuration();
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -37,7 +37,7 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -76,7 +76,7 @@ class ImmutableCollections {
         // derived from the JVM build/version, so can we generate the exact same
         // CDS archive for the same JDK build. This makes it possible to verify the
         // consistency of the JDK build.
-        long seed = VM.getRandomSeedForCDSDump();
+        long seed = CDS.getRandomSeedForDumping();
         if (seed == 0) {
           seed = System.nanoTime();
         }
@@ -100,7 +100,7 @@ class ImmutableCollections {
     static final MapN<?,?> EMPTY_MAP;
 
     static {
-        VM.initializeFromArchive(ImmutableCollections.class);
+        CDS.initializeFromArchive(ImmutableCollections.class);
         if (archivedObjects == null) {
             EMPTY = new Object();
             EMPTY_LIST = new ListN<>();
diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java
@@ -34,7 +34,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 import jdk.internal.vm.annotation.Stable;
 
 import sun.nio.cs.UTF_8;
@@ -672,7 +672,7 @@ private static void addName(Map<String, Name> names, Name name) {
 
         static {
 
-            VM.initializeFromArchive(Attributes.Name.class);
+            CDS.initializeFromArchive(Attributes.Name.class);
 
             if (KNOWN_NAMES == null) {
                 MANIFEST_VERSION = new Name("Manifest-Version");
diff --git a/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java b/src/java.base/share/classes/jdk/internal/loader/ArchivedClassLoaders.java
@@ -25,7 +25,7 @@
 package jdk.internal.loader;
 
 import java.util.Map;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 import jdk.internal.module.ServicesCatalog;
 
 /**
@@ -91,6 +91,6 @@ static ArchivedClassLoaders get() {
     }
 
     static {
-        VM.initializeFromArchive(ArchivedClassLoaders.class);
+        CDS.initializeFromArchive(ArchivedClassLoaders.class);
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java b/src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  */
 package jdk.internal.math;
 
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -84,7 +84,7 @@
 
     // Initialize FDBigInteger cache of powers of 5.
     static {
-        VM.initializeFromArchive(FDBigInteger.class);
+        CDS.initializeFromArchive(FDBigInteger.class);
         Object[] caches = archivedCaches;
         if (caches == null) {
             long[] long5pow = {
diff --git a/src/java.base/share/classes/jdk/internal/misc/VM.java b/src/java.base/share/classes/jdk/internal/misc/VM.java
@@ -457,31 +457,6 @@ public static boolean isSetUID() {
     }
     private static native void initialize();
 
-    /**
-     * Initialize archived static fields in the given Class using archived
-     * values from CDS dump time. Also initialize the classes of objects in
-     * the archived graph referenced by those fields.
-     *
-     * Those static fields remain as uninitialized if there is no mapped CDS
-     * java heap data or there is any error during initialization of the
-     * object class in the archived graph.
-     */
-    public static native void initializeFromArchive(Class<?> c);
-
-    public static native void defineArchivedModules(ClassLoader platformLoader, ClassLoader systemLoader);
-
-    public static native long getRandomSeedForCDSDump();
-
-    /**
-     * Check if CDS dynamic dumping is enabled via the DynamicDumpSharedSpaces flag.
-     */
-    public static native boolean isCDSDumpingEnabled();
-
-    /**
-     * Check if CDS sharing is enabled by via the UseSharedSpaces flag.
-     */
-    public static native boolean isCDSSharingEnabled();
-
     /**
      * Provides access to information on buffer usage.
      */
diff --git a/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java b/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java
@@ -24,7 +24,7 @@
  */
 package jdk.internal.module;
 
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 /**
  * Used by ModuleBootstrap for archiving the boot layer and the builder needed to
@@ -59,6 +59,6 @@ static void archive(ModuleLayer layer, IllegalAccessLogger.Builder builder) {
     }
 
     static {
-        VM.initializeFromArchive(ArchivedBootLayer.class);
+        CDS.initializeFromArchive(ArchivedBootLayer.class);
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java b/src/java.base/share/classes/jdk/internal/module/ArchivedModuleGraph.java
@@ -29,7 +29,7 @@
 import java.util.function.Function;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 
 /**
  * Used by ModuleBootstrap for archiving the configuration for the boot layer,
@@ -123,6 +123,6 @@ static void archive(boolean hasSplitPackages,
     }
 
     static {
-        VM.initializeFromArchive(ArchivedModuleGraph.class);
+        CDS.initializeFromArchive(ArchivedModuleGraph.class);
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -54,7 +54,7 @@
 import jdk.internal.loader.BootLoader;
 import jdk.internal.loader.BuiltinClassLoader;
 import jdk.internal.loader.ClassLoaders;
-import jdk.internal.misc.VM;
+import jdk.internal.misc.CDS;
 import jdk.internal.perf.PerfCounter;
 
 /**
@@ -167,7 +167,7 @@ public static ModuleLayer boot() {
             assert canUseArchivedBootLayer();
             bootLayer = archivedBootLayer.bootLayer();
             BootLoader.getUnnamedModule(); // trigger <clinit> of BootLoader.
-            VM.defineArchivedModules(ClassLoaders.platformClassLoader(), ClassLoaders.appClassLoader());
+            CDS.defineArchivedModules(ClassLoaders.platformClassLoader(), ClassLoaders.appClassLoader());
 
             // assume boot layer has at least one module providing a service
             // that is mapped to the application class loader.
diff --git a/src/java.base/share/classes/sun/util/locale/BaseLocale.java b/src/java.base/share/classes/sun/util/locale/BaseLocale.java
diff --git a/src/java.base/share/native/libjava/CDS.c b/src/java.base/share/native/libjava/CDS.c
diff --git a/src/java.base/share/native/libjava/VM.c b/src/java.base/share/native/libjava/VM.c

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@`
`55`	`55`	`import jdk.internal.loader.BuiltinClassLoader;`
`56`	`56`	`import jdk.internal.loader.BootLoader;`
`57`	`57`	`import jdk.internal.loader.ClassLoaders;`
	`58`	`+import jdk.internal.misc.CDS;`
`58`	`59`	`import jdk.internal.misc.VM;`
`59`	`60`	`import jdk.internal.module.IllegalAccessLogger;`
`60`	`61`	`import jdk.internal.module.ModuleLoaderMap;`
`@@ -277,7 +278,7 @@ static ArchivedData get() {`
`277`	`278`	`}`
`278`	`279`
`279`	`280`	`static {`
`280`		`- VM.initializeFromArchive(ArchivedData.class);`
	`281`	`+ CDS.initializeFromArchive(ArchivedData.class);`
`281`	`282`	`}`
`282`	`283`	`}`
`283`	`284`