Skip to content

Commit

Permalink
Fix FullGCForwarding initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
rkennke committed Sep 10, 2024
1 parent 5da250c commit 6abda7b
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/g1CollectedHeap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ jint G1CollectedHeap::initialize() {

G1InitLogger::print();

FullGCForwarding::initialize();
FullGCForwarding::initialize(heap_rs.region());

return JNI_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jint ParallelScavengeHeap::initialize() {

ParallelInitLogger::print();

FullGCForwarding::initialize();
FullGCForwarding::initialize(heap_rs.region());

return JNI_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/serial/serialHeap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ jint SerialHeap::initialize() {

GCInitLogger::print();

FullGCForwarding::initialize();
FullGCForwarding::initialize(_reserved);

return JNI_OK;
}
Expand Down
3 changes: 2 additions & 1 deletion src/hotspot/share/gc/shared/fullGCForwarding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ void FullGCForwarding::initialize_flags(size_t max_heap_size) {
#endif
}

void FullGCForwarding::initialize() {
void FullGCForwarding::initialize(MemRegion heap) {
#ifdef _LP64
_heap_base = heap.start();
if (UseCompactObjectHeaders) {
_num_low_bits = NumLowBitsNarrow;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shared/fullGCForwarding.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class FullGCForwarding : public AllStatic {
static int _num_low_bits;
public:
static void initialize_flags(size_t max_heap_size);
static void initialize();
static void initialize(MemRegion heap);
static inline void forward_to(oop from, oop to);
static inline oop forwardee(oop from);
static inline bool is_forwarded(oop obj);
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ jint ShenandoahHeap::initialize() {

ShenandoahInitLogger::print();

FullGCForwarding::initialize();
FullGCForwarding::initialize(_heap_region);

return JNI_OK;
}
Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TEST_VM(PreservedMarks, iterate_and_restore) {

HeapWord fakeheap[32] = { nullptr };
HeapWord* heap = align_up(fakeheap, 8 * sizeof(HeapWord));
FullGCForwarding::initialize();
FullGCForwarding::initialize(MemRegion(&heap[0], &heap[16]));

oop o1 = cast_to_oop(&heap[0]); o1->set_mark(originalMark());
oop o2 = cast_to_oop(&heap[2]); o2->set_mark(originalMark());
Expand Down

0 comments on commit 6abda7b

Please sign in to comment.