stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8291238: JDK can't be built without G1

Browse Source 
Reviewed-by: stuefe, jiefu
This commit is contained in:
Calvin Cheung 2022-08-09 16:30:44 +00:00
parent aff7689a00
commit 8d0d9eaa9c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/cds/filemap.cpp
View File

@ -255,10 +255,12 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
_heap_begin = CompressedOops::begin(); _heap_begin = CompressedOops::begin();
_heap_end = CompressedOops::end(); _heap_end = CompressedOops::end();
} else { } else {
#if INCLUDE_G1GC
address start = (address)G1CollectedHeap::heap()->reserved().start(); address start = (address)G1CollectedHeap::heap()->reserved().start();
address end = (address)G1CollectedHeap::heap()->reserved().end(); address end = (address)G1CollectedHeap::heap()->reserved().end();
_heap_begin = HeapShared::to_requested_address(start); _heap_begin = HeapShared::to_requested_address(start);
_heap_end = HeapShared::to_requested_address(end); _heap_end = HeapShared::to_requested_address(end);
#endif
} }
} }
_compressed_oops = UseCompressedOops; _compressed_oops = UseCompressedOops;
@ -1522,7 +1524,9 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
if (UseCompressedOops) { if (UseCompressedOops) {
mapping_offset = (size_t)CompressedOops::encode_not_null(cast_to_oop(base)); mapping_offset = (size_t)CompressedOops::encode_not_null(cast_to_oop(base));
} else { } else {
#if INCLUDE_G1GC
mapping_offset = requested_base - (char*)G1CollectedHeap::heap()->reserved().start(); mapping_offset = requested_base - (char*)G1CollectedHeap::heap()->reserved().start();
#endif
} }
assert(mapping_offset == (size_t)(uint32_t)mapping_offset, "must be 32-bit only"); assert(mapping_offset == (size_t)(uint32_t)mapping_offset, "must be 32-bit only");
} else { } else {