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

*** 37,10 ***
--- 37,11 ---
  #include "gc/g1/g1FullGCResetMetadataTask.hpp"
  #include "gc/g1/g1FullGCScope.hpp"
  #include "gc/g1/g1OopClosures.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
+ #include "gc/shared/gcForwarding.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/preservedMarks.inline.hpp"
  #include "gc/shared/referenceProcessor.hpp"
  #include "gc/shared/verifyOption.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"

*** 208,10 ***
--- 209,11 ---
    verify_after_marking();
  
    // Don't add any more derived pointers during later phases
    deactivate_derived_pointers();
  
+   GCForwarding::begin();
    phase2_prepare_compaction();
  
    if (has_compaction_targets()) {
      phase3_adjust_pointers();
  

*** 220,10 ***
--- 222,12 ---
      // All regions have a high live ratio thus will not be compacted.
      // The live ratio is only considered if do_maximal_compaction is false.
      log_info(gc, phases) ("No Regions selected for compaction. Skipping Phase 3: Adjust pointers and Phase 4: Compact heap");
    }
  
+   GCForwarding::end();
+ 
    phase5_reset_metadata();
  
    G1CollectedHeap::finish_codecache_marking_cycle();
  }