OpenJDK / portola / portola
changeset 53928:bae1944fc279
8219574: Minimal VM build failure after JDK-8219414
Reviewed-by: jgeorge, dholmes, cjplummer
| author | shade |
|---|---|
| date | Fri, 22 Feb 2019 17:54:13 +0100 |
| parents | 853b82a25d53 |
| children | 4008a1d5cfbc |
| files | src/hotspot/os/linux/os_linux.cpp src/hotspot/share/classfile/classLoader.cpp |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/os/linux/os_linux.cpp Fri Feb 22 16:41:01 2019 +0100 +++ b/src/hotspot/os/linux/os_linux.cpp Fri Feb 22 17:54:13 2019 +0100 @@ -1359,11 +1359,9 @@ void os::abort(bool dump_core, void* siginfo, const void* context) { os::shutdown(); if (dump_core) { -#ifndef ZERO if (DumpPrivateMappingsInCore) { ClassLoader::close_jrt_image(); } -#endif #ifndef PRODUCT fdStream out(defaultStream::output_fd()); out.print_raw("Current thread is ");
--- a/src/hotspot/share/classfile/classLoader.cpp Fri Feb 22 16:41:01 2019 +0100 +++ b/src/hotspot/share/classfile/classLoader.cpp Fri Feb 22 17:54:13 2019 +0100 @@ -620,13 +620,14 @@ update_module_path_entry_list(path, THREAD); } +#endif // INCLUDE_CDS + void ClassLoader::close_jrt_image() { - assert(ClassLoader::has_jrt_entry(), "Not applicable for exploded builds"); + // Not applicable for exploded builds + if (!ClassLoader::has_jrt_entry()) return; _jrt_entry->close_jimage(); } -#endif // INCLUDE_CDS - // Construct the array of module/path pairs as specified to --patch-module // for the boot loader to search ahead of the jimage, if the class being // loaded is defined to a module that has been specified to --patch-module.