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

G1BarrierSet_merge

*** 25,34 ****
--- 25,35 ----
  #ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
  #define SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
  
  #include "gc/g1/evacuationInfo.hpp"
  #include "gc/g1/g1AllocationContext.hpp"
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BiasedArray.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.hpp"
***************
*** 38,48 ****
  #include "gc/g1/g1HeapTransition.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1HRPrinter.hpp"
  #include "gc/g1/g1InCSetState.hpp"
  #include "gc/g1/g1MonitoringSupport.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/g1SurvivorRegions.hpp"
  #include "gc/g1/g1YCTypes.hpp"
  #include "gc/g1/heapRegionManager.hpp"
  #include "gc/g1/heapRegionSet.hpp"
  #include "gc/shared/barrierSet.hpp"
--- 39,48 ----
***************
*** 1172,1185 ****
      return _hrm.reserved();
    }
  
    virtual bool is_in_closed_subset(const void* p) const;
  
-   G1SATBCardTableLoggingModRefBS* g1_barrier_set() {
-     return barrier_set_cast<G1SATBCardTableLoggingModRefBS>(barrier_set());
-   }
- 
    G1HotCardCache* g1_hot_card_cache() const { return _hot_card_cache; }
  
    G1CardTable* card_table() const {
      return _card_table;
    }
--- 1172,1181 ----