Skip to content

Commit 8d0d9ea

Browse files
committed
8291238: JDK can't be built without G1
Reviewed-by: stuefe, jiefu
1 parent aff7689 commit 8d0d9ea

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/hotspot/share/cds/filemap.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,12 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
255255
_heap_begin = CompressedOops::begin();
256256
_heap_end = CompressedOops::end();
257257
} else {
258+
#if INCLUDE_G1GC
258259
address start = (address)G1CollectedHeap::heap()->reserved().start();
259260
address end = (address)G1CollectedHeap::heap()->reserved().end();
260261
_heap_begin = HeapShared::to_requested_address(start);
261262
_heap_end = HeapShared::to_requested_address(end);
263+
#endif
262264
}
263265
}
264266
_compressed_oops = UseCompressedOops;
@@ -1522,7 +1524,9 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
15221524
if (UseCompressedOops) {
15231525
mapping_offset = (size_t)CompressedOops::encode_not_null(cast_to_oop(base));
15241526
} else {
1527+
#if INCLUDE_G1GC
15251528
mapping_offset = requested_base - (char*)G1CollectedHeap::heap()->reserved().start();
1529+
#endif
15261530
}
15271531
assert(mapping_offset == (size_t)(uint32_t)mapping_offset, "must be 32-bit only");
15281532
} else {

0 commit comments

Comments
 (0)