archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8253496: [BACKOUT] JDK-8253208 Move CDS related code to a separate class

Browse source 
Reviewed-by: eosterlund, dcubed
This commit is contained in:
Ioi Lam 2020-09-22 20:15:01 +00:00
parent 581f0f2643
commit 65af837391
22 changed files with 99 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/lang/Byte.java
View file

@ -26,7 +26,7 @@
package java.lang;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
import java.lang.constant.Constable;
import java.lang.constant.DynamicConstantDesc;
@ -108,7 +108,7 @@ public final class Byte extends Number implements Comparable<Byte>, Constable {
final int size = -(-128) + 127 + 1;
// Load and use the archived cache if it exists
CDS.initializeFromArchive(ByteCache.class);
VM.initializeFromArchive(ByteCache.class);
if (archivedCache == null || archivedCache.length != size) {
Byte[] c = new Byte[size];
byte value = (byte)-128;

4
src/java.base/share/classes/java/lang/Character.java
View file

@ -26,7 +26,7 @@
package java.lang;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
import java.lang.constant.Constable;
import java.lang.constant.DynamicConstantDesc;
@ -8516,7 +8516,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
int size = 127 + 1;
// Load and use the archived cache if it exists
CDS.initializeFromArchive(CharacterCache.class);
VM.initializeFromArchive(CharacterCache.class);
if (archivedCache == null || archivedCache.length != size) {
Character[] c = new Character[size];
for (int i = 0; i < size; i++) {

3
src/java.base/share/classes/java/lang/Integer.java
View file

@ -33,7 +33,6 @@ import java.util.Objects;
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;
@ -1024,7 +1023,7 @@ public final class Integer extends Number
high = h;
// Load IntegerCache.archivedCache from archive, if possible
CDS.initializeFromArchive(IntegerCache.class);
VM.initializeFromArchive(IntegerCache.class);
int size = (high - low) + 1;
// Use the archived cache if it exists and is large enough

4
src/java.base/share/classes/java/lang/Long.java
View file

@ -34,7 +34,7 @@ import java.util.Objects;
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;
import static java.lang.String.LATIN1;
@ -1169,7 +1169,7 @@ public final class Long extends Number
int size = -(-128) + 127 + 1;
// Load and use the archived cache if it exists
CDS.initializeFromArchive(LongCache.class);
VM.initializeFromArchive(LongCache.class);
if (archivedCache == null || archivedCache.length != size) {
Long[] c = new Long[size];
long value = -128;

3
src/java.base/share/classes/java/lang/Module.java
View file

@ -55,7 +55,6 @@ import java.util.stream.Stream;
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;
@ -278,7 +277,7 @@ public final class Module implements AnnotatedElement {
}
static {
CDS.initializeFromArchive(ArchivedData.class);
VM.initializeFromArchive(ArchivedData.class);
}
}

4
src/java.base/share/classes/java/lang/Short.java
View file

@ -26,7 +26,7 @@
package java.lang;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
import java.lang.constant.Constable;
import java.lang.constant.DynamicConstantDesc;
@ -234,7 +234,7 @@ public final class Short extends Number implements Comparable<Short>, Constable
int size = -(-128) + 127 + 1;
// Load and use the archived cache if it exists
CDS.initializeFromArchive(ShortCache.class);
VM.initializeFromArchive(ShortCache.class);
if (archivedCache == null || archivedCache.length != size) {
Short[] c = new Short[size];
short value = -128;

6
src/java.base/share/classes/java/lang/invoke/LambdaProxyClassArchive.java
View file

@ -26,15 +26,15 @@
package java.lang.invoke;
import jdk.internal.loader.BuiltinClassLoader;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
final class LambdaProxyClassArchive {
private static final boolean dumpArchive;
private static final boolean sharingEnabled;
static {
dumpArchive = CDS.isDynamicDumpingEnabled();
sharingEnabled = CDS.isSharingEnabled();
dumpArchive = VM.isCDSDumpingEnabled();
sharingEnabled = VM.isCDSSharingEnabled();
}
/**

4
src/java.base/share/classes/java/lang/module/Configuration.java
View file

@ -41,7 +41,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
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.
CDS.initializeFromArchive(Configuration.class);
VM.initializeFromArchive(Configuration.class);
// Create a new empty Configuration if there is no archived version.
if (EMPTY_CONFIGURATION == null) {
EMPTY_CONFIGURATION = new Configuration();