src/hotspot/share/gc/g1/g1SharedClosures.hpp

*** 33,51 ****
  // Simple holder object for a complete set of closures used by the G1 evacuation code.
  template <G1Mark Mark, bool use_ext = false>
  class G1SharedClosures VALUE_OBJ_CLASS_SPEC {
  public:
    G1ParCopyClosure<G1BarrierNone,  Mark, use_ext> _oops;
!   G1ParCopyClosure<G1BarrierKlass, Mark, use_ext> _oop_in_klass;
!   G1KlassScanClosure                              _klass_in_cld_closure;
!   CLDToKlassAndOopClosure                         _clds;
    G1CodeBlobClosure                               _codeblobs;
    BufferingOopClosure                             _buffered_oops;
  
!   G1SharedClosures(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty_klasses, bool must_claim_cld) :
      _oops(g1h, pss),
!     _oop_in_klass(g1h, pss),
!     _klass_in_cld_closure(&_oop_in_klass, process_only_dirty_klasses),
!     _clds(&_klass_in_cld_closure, &_oops, must_claim_cld),
      _codeblobs(&_oops),
      _buffered_oops(&_oops) {}
  };
--- 33,50 ----
  // Simple holder object for a complete set of closures used by the G1 evacuation code.
  template <G1Mark Mark, bool use_ext = false>
  class G1SharedClosures VALUE_OBJ_CLASS_SPEC {
  public:
    G1ParCopyClosure<G1BarrierNone, Mark, use_ext> _oops;
!   G1ParCopyClosure<G1BarrierCLD,  Mark, use_ext> _oops_in_cld;
! 
!   G1CLDScanClosure                _clds;
    G1CodeBlobClosure               _codeblobs;
    BufferingOopClosure             _buffered_oops;
  
!   G1SharedClosures(G1CollectedHeap* g1h, G1ParScanThreadState* pss, bool process_only_dirty, bool must_claim_cld) : 
      _oops(g1h, pss),
!     _oops_in_cld(g1h, pss),
!     _clds(&_oops_in_cld, process_only_dirty, must_claim_cld),
      _codeblobs(&_oops),
      _buffered_oops(&_oops) {}
  };