archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8362336: Revert changes in metaspaceShared.cpp done via JDK-8356807

Browse source 
Reviewed-by: iklam
This commit is contained in:
Calvin Cheung 2025-07-16 16:02:44 +00:00
parent 10ae602944
commit 8193856af8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/share/cds/metaspaceShared.cpp
View file

@ -1428,7 +1428,7 @@ FileMapInfo* MetaspaceShared::open_dynamic_archive() {
MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, FileMapInfo* dynamic_mapinfo, MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, FileMapInfo* dynamic_mapinfo,
bool use_requested_addr) { bool use_requested_addr) {
if (use_requested_addr && static_mapinfo->requested_base_address() == nullptr) { if (use_requested_addr && static_mapinfo->requested_base_address() == nullptr) {
report_loading_error("Archive(s) were created with -XX:SharedBaseAddress=0. Always map at os-selected address."); aot_log_info(aot)("Archive(s) were created with -XX:SharedBaseAddress=0. Always map at os-selected address.");
return MAP_ARCHIVE_MMAP_FAILURE; return MAP_ARCHIVE_MMAP_FAILURE;
} }
@ -1436,12 +1436,12 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
// For product build only -- this is for benchmarking the cost of doing relocation. // For product build only -- this is for benchmarking the cost of doing relocation.
// For debug builds, the check is done below, after reserving the space, for better test coverage // For debug builds, the check is done below, after reserving the space, for better test coverage
// (see comment below). // (see comment below).
report_loading_error("ArchiveRelocationMode == 1: always map archive(s) at an alternative address"); aot_log_info(aot)("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
return MAP_ARCHIVE_MMAP_FAILURE; return MAP_ARCHIVE_MMAP_FAILURE;
}); });
if (ArchiveRelocationMode == 2 && !use_requested_addr) { if (ArchiveRelocationMode == 2 && !use_requested_addr) {
report_loading_error("ArchiveRelocationMode == 2: never map archive(s) at an alternative address"); aot_log_info(aot)("ArchiveRelocationMode == 2: never map archive(s) at an alternative address");
return MAP_ARCHIVE_MMAP_FAILURE; return MAP_ARCHIVE_MMAP_FAILURE;
}; };