Merge branch 'JDK-8305896-v2' into JDK-8305895-v3

rkennke · Aug 22, 2024 · 2ead7a5 · 2ead7a5
2 parents 525a8ef + d5f735f
commit 2ead7a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -702,8 +702,6 @@ void DefNewGeneration::remove_forwarding_pointers() {
     void do_object(oop obj) override {
       if (obj->is_self_forwarded()) {
         obj->unset_self_forwarded();
-      } else if (obj->is_forwarded()) {
-        obj->forward_safe_init_mark();
       }
     }
   } cl;

diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
@@ -100,7 +100,7 @@ void ContiguousSpace::object_iterate(ObjectClosure* blk) {
   while (addr < top()) {
     oop obj = cast_to_oop(addr);
     blk->do_object(obj);
-    addr += obj->size();
+    addr += obj->forward_safe_size();
   }
 }