--- a/src/hotspot/share/classfile/sharedClassUtil.cpp Tue Apr 10 10:06:42 2018 -0400
+++ b/src/hotspot/share/classfile/sharedClassUtil.cpp Tue Apr 10 11:43:40 2018 -0700
@@ -93,6 +93,9 @@
case APP:
ClassLoader::trace_class_path("Expecting -Djava.class.path=", path);
break;
+ case MODULE:
+ ClassLoader::trace_class_path("Checking module path: ", path);
+ break;
default:
SharedPathsMiscInfo::print_path(out, type, path);
}
@@ -167,12 +170,13 @@
void SharedClassUtil::initialize(TRAPS) {
if (UseSharedSpaces) {
- int size = FileMapInfo::get_number_of_share_classpaths();
+ int size = FileMapInfo::get_number_of_shared_paths();
if (size > 0) {
SystemDictionaryShared::allocate_shared_data_arrays(size, THREAD);
if (!DumpSharedSpaces) {
FileMapHeaderExt* header = (FileMapHeaderExt*)FileMapInfo::current_info()->header();
- ClassLoaderExt::init_paths_start_index(header->_app_paths_start_index);
+ ClassLoaderExt::init_paths_start_index(header->_app_class_paths_start_index);
+ ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index);
}
}
}
@@ -208,7 +212,7 @@
bool SharedClassUtil::is_classpath_entry_signed(int classpath_index) {
assert(classpath_index >= 0, "Sanity");
SharedClassPathEntryExt* ent = (SharedClassPathEntryExt*)
- FileMapInfo::shared_classpath(classpath_index);
+ FileMapInfo::shared_path(classpath_index);
return ent->_is_signed;
}
@@ -216,7 +220,8 @@
FileMapInfo::FileMapHeader::populate(mapinfo, alignment);
ClassLoaderExt::finalize_shared_paths_misc_info();
- _app_paths_start_index = ClassLoaderExt::app_paths_start_index();
+ _app_class_paths_start_index = ClassLoaderExt::app_class_paths_start_index();
+ _app_module_paths_start_index = ClassLoaderExt::app_module_paths_start_index();
_verify_local = BytecodeVerificationLocal;
_verify_remote = BytecodeVerificationRemote;