src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp

*** 27,10 ***
--- 27,11 ---
  #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
  #include "gc/g1/g1FullCollector.inline.hpp"
  #include "gc/g1/g1FullGCCompactionPoint.hpp"
  #include "gc/g1/g1FullGCCompactTask.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
+ #include "gc/shared/gcForwarding.inline.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "utilities/ticks.hpp"
  

*** 39,28 ***
    _bitmap->clear(obj);
  }
  
  size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
    size_t size = obj->size();
!   if (obj->is_forwarded()) {
      G1FullGCCompactTask::copy_object_to_new_location(obj);
    }
  
    // Clear the mark for the compacted object to allow reuse of the
    // bitmap without an additional clearing step.
    clear_in_bitmap(obj);
    return size;
  }
  
  void G1FullGCCompactTask::copy_object_to_new_location(oop obj) {
!   assert(obj->is_forwarded(), "Sanity!");
!   assert(obj->forwardee() != obj, "Object must have a new location");
  
    size_t size = obj->size();
    // Copy object and reinit its mark.
    HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
!   HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
    Copy::aligned_conjoint_words(obj_addr, destination, size);
  
    // There is no need to transform stack chunks - marking already did that.
    cast_to_oop(destination)->init_mark();
    assert(cast_to_oop(destination)->klass() != nullptr, "should have a class");
--- 40,28 ---
    _bitmap->clear(obj);
  }
  
  size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
    size_t size = obj->size();
!   if (GCForwarding::is_forwarded(obj)) {
      G1FullGCCompactTask::copy_object_to_new_location(obj);
    }
  
    // Clear the mark for the compacted object to allow reuse of the
    // bitmap without an additional clearing step.
    clear_in_bitmap(obj);
    return size;
  }
  
  void G1FullGCCompactTask::copy_object_to_new_location(oop obj) {
!   assert(GCForwarding::is_forwarded(obj), "Sanity!");
!   assert(GCForwarding::forwardee(obj) != obj, "Object must have a new location");
  
    size_t size = obj->size();
    // Copy object and reinit its mark.
    HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
!   HeapWord* destination = cast_from_oop<HeapWord*>(GCForwarding::forwardee(obj));
    Copy::aligned_conjoint_words(obj_addr, destination, size);
  
    // There is no need to transform stack chunks - marking already did that.
    cast_to_oop(destination)->init_mark();
    assert(cast_to_oop(destination)->klass() != nullptr, "should have a class");

*** 118,11 ***
  
    oop obj = cast_to_oop(src_hr->bottom());
    size_t word_size = obj->size();
  
    uint num_regions = (uint)G1CollectedHeap::humongous_obj_size_in_regions(word_size);
!   HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
  
    assert(collector()->mark_bitmap()->is_marked(obj), "Should only compact marked objects");
    collector()->mark_bitmap()->clear(obj);
  
    copy_object_to_new_location(obj);
--- 119,11 ---
  
    oop obj = cast_to_oop(src_hr->bottom());
    size_t word_size = obj->size();
  
    uint num_regions = (uint)G1CollectedHeap::humongous_obj_size_in_regions(word_size);
!   HeapWord* destination = cast_from_oop<HeapWord*>(GCForwarding::forwardee(obj));
  
    assert(collector()->mark_bitmap()->is_marked(obj), "Should only compact marked objects");
    collector()->mark_bitmap()->clear(obj);
  
    copy_object_to_new_location(obj);