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

*** 29,10 ***
--- 29,11 ---
  #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/gcTraceTime.inline.hpp"
+ #include "gc/shared/slidingForwarding.inline.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "utilities/ticks.hpp"
  
  // Do work for all skip-compacting regions.

*** 58,16 ***
    }
  };
  
  size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
    size_t size = obj->size();
!   HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
-   if (destination == NULL) {
      // Object not moving
      return size;
    }
  
    // copy object and reinit its mark
    HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
    assert(obj_addr != destination, "everything in this pass should be moving");
    Copy::aligned_conjoint_words(obj_addr, destination, size);
    cast_to_oop(destination)->init_mark();
--- 59,17 ---
    }
  };
  
  size_t G1FullGCCompactTask::G1CompactRegionClosure::apply(oop obj) {
    size_t size = obj->size();
!   if (!obj->is_forwarded()) {
      // Object not moving
      return size;
    }
  
+   HeapWord* destination = cast_from_oop<HeapWord*>(_forwarding->forwardee(obj));
+ 
    // copy object and reinit its mark
    HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
    assert(obj_addr != destination, "everything in this pass should be moving");
    Copy::aligned_conjoint_words(obj_addr, destination, size);
    cast_to_oop(destination)->init_mark();