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

8209385: CDS runtime classpath checking is too strict when only classes from the system modules are archived

Browse source 
Skip checking the path entries which are not being referenced during CDS dump time

Reviewed-by: jiangli, iklam
This commit is contained in:
Calvin Cheung 2018-08-17 14:50:59 -07:00
parent 15cef25bb0
commit 660c7e50f7
8 changed files with 122 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/hotspot/share/classfile/sharedPathsMiscInfo.cpp
View file

@ -115,10 +115,15 @@ bool SharedPathsMiscInfo::check() {
return fail("Corrupted archive file header");
}
jshort cur_index = 0;
jshort max_cp_index = FileMapInfo::current_info()->header()->max_used_path_index();
jshort module_paths_start_index =
FileMapInfo::current_info()->header()->app_module_paths_start_index();
while (_cur_ptr < _end_ptr) {
jint type;
const char* path = _cur_ptr;
_cur_ptr += strlen(path) + 1;
if (!read_jint(&type)) {
return fail("Corrupted archive file header");
}
@ -129,13 +134,19 @@ bool SharedPathsMiscInfo::check() {
print_path(&ls, type, path);
ls.cr();
}
if (!check(type, path)) {
if (!PrintSharedArchiveAndExit) {
return false;
// skip checking the class path(s) which was not referenced during CDS dump
if ((cur_index <= max_cp_index) || (cur_index >= module_paths_start_index)) {
if (!check(type, path)) {
if (!PrintSharedArchiveAndExit) {
return false;
}
} else {
ClassLoader::trace_class_path("ok");
}
} else {
ClassLoader::trace_class_path("ok");
ClassLoader::trace_class_path("skipped check");
}
cur_index++;
}
return true;