< prev index next >

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

G1BarrierSet_merge
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RootProcessor.hpp"
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #include "gc/g1/g1StringDedup.hpp"
 #include "gc/g1/g1YCTypes.hpp"
 #include "gc/g1/g1YoungRemSetSamplingThread.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 #include "gc/g1/heapRegionRemSet.hpp"

@@ -1618,13 +1617,13 initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size())); // Create the barrier set for the entire reserved region. G1CardTable* ct = new G1CardTable(reserved_region()); ct->initialize(); - G1SATBCardTableLoggingModRefBS* bs = new G1SATBCardTableLoggingModRefBS(ct); + G1BarrierSet* bs = new G1BarrierSet(ct); bs->initialize(); - assert(bs->is_a(BarrierSet::G1SATBCTLogging), "sanity"); + assert(bs->is_a(BarrierSet::G1BarrierSet), "sanity"); set_barrier_set(bs); _card_table = ct; // Create the hot card cache. _hot_card_cache = new G1HotCardCache(this);
< prev index next >