Skip to content
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Mar 24, 2021
2 parents 1ca5e41 + 133a63b commit 83c06f51b56f84f521f8179c6a94487543aa78b1
Showing 3 changed files with 22 additions and 3 deletions.
@@ -93,6 +93,7 @@ static ArchivableStaticFieldInfo closed_archive_subgraph_entry_fields[] = {
static ArchivableStaticFieldInfo open_archive_subgraph_entry_fields[] = {
{"jdk/internal/module/ArchivedModuleGraph", "archivedModuleGraph"},
{"java/util/ImmutableCollections", "archivedObjects"},
{"java/lang/ModuleLayer", "EMPTY_LAYER"},
{"java/lang/module/Configuration", "EMPTY_CONFIGURATION"},
{"jdk/internal/math/FDBigInteger", "archivedCaches"},
};
@@ -48,6 +48,8 @@
import jdk.internal.loader.Loader;
import jdk.internal.loader.LoaderPool;
import jdk.internal.module.ServicesCatalog;
import jdk.internal.misc.CDS;
import jdk.internal.vm.annotation.Stable;
import sun.security.util.SecurityConstants;


@@ -147,9 +149,15 @@

public final class ModuleLayer {

// the empty layer
private static final ModuleLayer EMPTY_LAYER
= new ModuleLayer(Configuration.empty(), List.of(), null);
// the empty layer (may be initialized from the CDS archive)
private static @Stable ModuleLayer EMPTY_LAYER;
static {
CDS.initializeFromArchive(ModuleLayer.class);
if (EMPTY_LAYER == null) {
// create a new empty layer if there is no archived version.
EMPTY_LAYER = new ModuleLayer(Configuration.empty(), List.of(), null);
}
}

// the configuration from which this layer was created
private final Configuration cf;
@@ -61,6 +61,7 @@ public static void main(String args[]) throws Exception {
checkModuleDescriptors(expectArchivedDescriptors);
checkConfiguration(expectArchivedConfiguration);
checkEmptyConfiguration(expectArchivedConfiguration);
checkEmptyLayer();
}

private static void checkModuleDescriptors(boolean expectArchivedDescriptors) {
@@ -139,4 +140,13 @@ private static void checkConfiguration(boolean expectArchivedConfiguration) {
}
}
}

private static void checkEmptyLayer() {
// ModuleLayer.EMPTY_FIELD returned by empty() method is singleton.
// Check that with CDS there is still a single instance of EMPTY_LAYER
// and boot() layer parent is THE empty layer.
if (ModuleLayer.empty() != ModuleLayer.boot().parents().get(0)) {
throw new RuntimeException("FAILED. Empty module layer is not singleton");
}
}
}

0 comments on commit 83c06f5

Please sign in to comment.