src/hotspot/share/gc/parallel/psScavenge.cpp

*** 28,10 ***
--- 28,11 ---
  #include "compiler/oopMap.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #include "gc/parallel/psAdaptiveSizePolicy.hpp"
  #include "gc/parallel/psClosure.inline.hpp"
  #include "gc/parallel/psCompactionManager.hpp"
+ #include "gc/parallel/psCompactionManagerNew.hpp"
  #include "gc/parallel/psParallelCompact.inline.hpp"
  #include "gc/parallel/psPromotionManager.inline.hpp"
  #include "gc/parallel/psRootType.hpp"
  #include "gc/parallel/psScavenge.inline.hpp"
  #include "gc/shared/gcCause.hpp"

*** 202,11 ***
    TaskTerminator _terminator;
  
  public:
    ParallelScavengeRefProcProxyTask(uint max_workers)
      : RefProcProxyTask("ParallelScavengeRefProcProxyTask", max_workers),
!       _terminator(max_workers, ParCompactionManager::marking_stacks()) {}
  
    void work(uint worker_id) override {
      assert(worker_id < _max_workers, "sanity");
      PSPromotionManager* promotion_manager = (_tm == RefProcThreadModel::Single) ? PSPromotionManager::vm_thread_promotion_manager() : PSPromotionManager::gc_thread_promotion_manager(worker_id);
      PSIsAliveClosure is_alive;
--- 203,11 ---
    TaskTerminator _terminator;
  
  public:
    ParallelScavengeRefProcProxyTask(uint max_workers)
      : RefProcProxyTask("ParallelScavengeRefProcProxyTask", max_workers),
!       _terminator(max_workers, UseCompactObjectHeaders ? ParCompactionManagerNew::marking_stacks() : ParCompactionManager::marking_stacks()) {}
  
    void work(uint worker_id) override {
      assert(worker_id < _max_workers, "sanity");
      PSPromotionManager* promotion_manager = (_tm == RefProcThreadModel::Single) ? PSPromotionManager::vm_thread_promotion_manager() : PSPromotionManager::gc_thread_promotion_manager(worker_id);
      PSIsAliveClosure is_alive;