resolve conflict

src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp

@@ -197,11 +197,7 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
                                   temp_reg, temp_reg2, itable_index, L_no_such_interface);
 
   // Reduce "estimate" such that "padding" does not drop below 8.
-<<<<<<< HEAD
-  const ptrdiff_t estimate = UseCompactObjectHeaders ? 132 : 124;
-=======
-  const ptrdiff_t estimate = 144;
->>>>>>> jdk-21.0.5+9
+  const ptrdiff_t estimate = UseCompactObjectHeaders ? 152 : 144;
   const ptrdiff_t codesize = __ pc() - start_pc;
   slop_delta  = (int)(estimate - codesize);
   slop_bytes += slop_delta;

src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp

@@ -367,15 +367,10 @@ class ShenandoahPrepareForCompactionObjectClosure : public ObjectClosure {
     // Object fits into current region, record new location, if object does not move:
     assert(_compact_point + obj_size <= _to_region->end(), "must fit");
     shenandoah_assert_not_forwarded(nullptr, p);
-<<<<<<< HEAD
-    _preserved_marks->push_if_necessary(p, p->mark());
-    SlidingForwarding::forward_to<ALT_FWD>(p, cast_to_oop(_compact_point));
-=======
     if (_compact_point != cast_from_oop<HeapWord*>(p)) {
       _preserved_marks->push_if_necessary(p, p->mark());
-      p->forward_to(cast_to_oop(_compact_point));
+      SlidingForwarding::forward_to<ALT_FWD>(p, cast_to_oop(_compact_point));
     }
->>>>>>> jdk-21.0.5+9
     _compact_point += obj_size;
   }
 };
@@ -901,12 +896,8 @@ class ShenandoahCompactObjectsClosure : public ObjectClosure {
     size_t size = p->size();
     if (SlidingForwarding::is_forwarded(p)) {
       HeapWord* compact_from = cast_from_oop<HeapWord*>(p);
-<<<<<<< HEAD
       HeapWord* compact_to = cast_from_oop<HeapWord*>(SlidingForwarding::forwardee<ALT_FWD>(p));
-=======
-      HeapWord* compact_to = cast_from_oop<HeapWord*>(p->forwardee());
       assert(compact_from != compact_to, "Forwarded object should move");
->>>>>>> jdk-21.0.5+9
       Copy::aligned_conjoint_words(compact_from, compact_to, size);
       oop new_obj = cast_to_oop(compact_to);