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

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

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();