Fix preservedMarks gtest

openjdk · Dec 12, 2024 · 42ca1c8 · 42ca1c8
1 parent eb5ff17
commit 42ca1c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/hotspot/share/gc/shared/fullGCForwarding.cpp b/src/hotspot/share/gc/shared/fullGCForwarding.cpp
@@ -100,8 +100,6 @@ void FullGCForwarding::initialize(MemRegion heap) {
   _heap_start_region_bias = (uintptr_t)_heap_start >> BLOCK_SIZE_BYTES_SHIFT;
   _region_mask = ~((uintptr_t(1) << BLOCK_SIZE_BYTES_SHIFT) - 1);
 
-  guarantee((_heap_start_region_bias << BLOCK_SIZE_BYTES_SHIFT) == (uintptr_t)_heap_start, "must be aligned: _heap_start_region_bias: " SIZE_FORMAT ", _region_size_byte_shift: %u, _heap_start: " PTR_FORMAT, _heap_start_region_bias, BLOCK_SIZE_BYTES_SHIFT, p2i(_heap_start));
-
   assert(_bases_table == nullptr, "should not be initialized yet");
   assert(_fallback_table == nullptr, "should not be initialized yet");
 #endif

diff --git a/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp b/test/hotspot/gtest/gc/shared/test_preservedMarks.cpp
@@ -56,6 +56,8 @@ TEST_VM(PreservedMarks, iterate_and_restore) {
   ASSERT_MARK_WORD_EQ(o1->mark(), changedMark());
   ASSERT_MARK_WORD_EQ(o2->mark(), changedMark());
 
+  FullGCForwarding::begin();
+
   // Push o1 and o2 to have their marks preserved.
   pm.push_if_necessary(o1, o1->mark());
   pm.push_if_necessary(o2, o2->mark());
@@ -74,4 +76,6 @@ TEST_VM(PreservedMarks, iterate_and_restore) {
   pm.restore();
   ASSERT_MARK_WORD_EQ(o3->mark(), changedMark());
   ASSERT_MARK_WORD_EQ(o4->mark(), changedMark());
+
+  FullGCForwarding::end();
 }