src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp

rev 7858 : 8073543: Circular include dependency between psScavenge.inline.hpp and psPromotionManager.inline.hpp

*** 103,113 ****
      assert ((oopDesc::load_decode_heap_oop_not_null(p))->is_oop(),
              "expected an oop while scanning weak refs");
  
      // Weak refs may be visited more than once.
      if (PSScavenge::should_scavenge(p, _to_space)) {
!       PSScavenge::copy_and_push_safe_barrier<T, /*promote_immediately=*/false>(_promotion_manager, p);
      }
    }
    virtual void do_oop(oop* p)       { PSKeepAliveClosure::do_oop_work(p); }
    virtual void do_oop(narrowOop* p) { PSKeepAliveClosure::do_oop_work(p); }
  };
--- 103,113 ----
      assert ((oopDesc::load_decode_heap_oop_not_null(p))->is_oop(),
              "expected an oop while scanning weak refs");
  
      // Weak refs may be visited more than once.
      if (PSScavenge::should_scavenge(p, _to_space)) {
!       _promotion_manager->copy_and_push_safe_barrier<T, /*promote_immediately=*/false>(p);
      }
    }
    virtual void do_oop(oop* p)       { PSKeepAliveClosure::do_oop_work(p); }
    virtual void do_oop(narrowOop* p) { PSKeepAliveClosure::do_oop_work(p); }
  };