Fix conflict in src/hotspot/share/gc/parallel/mutableSpace.cpp

dragonwell-project · Jul 22, 2024 · 9c43c18 · 9c43c18
1 parent d6ea7a2
commit 9c43c18
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -243,7 +243,6 @@ void MutableSpace::object_iterate_impl(ObjectClosure* cl) {
     // They are essentially dead, so skipping them
     if (!obj->is_forwarded()) {
       cl->do_object(obj);
-<<<<<<< HEAD
       p += obj->size();
     } else {
       assert(obj->forwardee() != obj, "must not be self-forwarded");
@@ -264,15 +263,6 @@ void MutableSpace::object_iterate(ObjectClosure* cl) {
     object_iterate_impl<true>(cl);
   } else {
     object_iterate_impl<false>(cl);
-=======
-    }
-#ifdef ASSERT
-    else {
-      assert(obj->forwardee() != obj, "must not be self-forwarded");
-    }
-#endif
-    p += cast_to_oop(p)->size();
->>>>>>> jdk-21.0.4+7
   }
 }