archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8219574: Minimal VM build failure after JDK-8219414

Browse source 
Reviewed-by: jgeorge, dholmes, cjplummer
This commit is contained in:
Aleksey Shipilev 2019-02-22 17:54:13 +01:00
parent c97af8c3f7
commit 8360a7884d
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/os/linux/os_linux.cpp
View file

@ -1359,11 +1359,9 @@ void os::shutdown() {
void os::abort(bool dump_core, void* siginfo, const void* context) { void os::abort(bool dump_core, void* siginfo, const void* context) {
os::shutdown(); os::shutdown();
if (dump_core) { if (dump_core) {
#ifndef ZERO
if (DumpPrivateMappingsInCore) { if (DumpPrivateMappingsInCore) {
ClassLoader::close_jrt_image(); ClassLoader::close_jrt_image();
} }
#endif
#ifndef PRODUCT #ifndef PRODUCT
fdStream out(defaultStream::output_fd()); fdStream out(defaultStream::output_fd());
out.print_raw("Current thread is "); out.print_raw("Current thread is ");

7
src/hotspot/share/classfile/classLoader.cpp
View file

@ -620,13 +620,14 @@ void ClassLoader::setup_module_search_path(const char* path, TRAPS) {
update_module_path_entry_list(path, THREAD); update_module_path_entry_list(path, THREAD);
} }
#endif // INCLUDE_CDS
void ClassLoader::close_jrt_image() { 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(); _jrt_entry->close_jimage();
} }
#endif // INCLUDE_CDS
// Construct the array of module/path pairs as specified to --patch-module // 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 // 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. // loaded is defined to a module that has been specified to --patch-module.