--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Wed Feb 13 15:50:08 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp Wed Feb 13 17:38:14 2019 -0500
@@ -31,6 +31,7 @@
#include "gc/g1/g1CollectionSet.hpp"
#include "gc/g1/g1CollectorState.hpp"
#include "gc/g1/g1ConcurrentMark.hpp"
+#include "gc/g1/g1DirtyCardQueue.hpp"
#include "gc/g1/g1EdenRegions.hpp"
#include "gc/g1/g1EvacFailure.hpp"
#include "gc/g1/g1EvacStats.hpp"
@@ -758,7 +759,7 @@
// A set of cards that cover the objects for which the Rsets should be updated
// concurrently after the collection.
- DirtyCardQueueSet _dirty_card_queue_set;
+ G1DirtyCardQueueSet _dirty_card_queue_set;
// After a collection pause, convert the regions in the collection set into free
// regions.
@@ -918,7 +919,7 @@
uint num_task_queues() const;
// A set of cards where updates happened during the GC
- DirtyCardQueueSet& dirty_card_queue_set() { return _dirty_card_queue_set; }
+ G1DirtyCardQueueSet& dirty_card_queue_set() { return _dirty_card_queue_set; }
// Create a G1CollectedHeap with the specified policy.
// Must call the initialize method afterwards.
@@ -983,10 +984,10 @@
void scrub_rem_set();
// Apply the given closure on all cards in the Hot Card Cache, emptying it.
- void iterate_hcc_closure(CardTableEntryClosure* cl, uint worker_i);
+ void iterate_hcc_closure(G1CardTableEntryClosure* cl, uint worker_i);
// Apply the given closure on all cards in the Dirty Card Queue Set, emptying it.
- void iterate_dirty_card_closure(CardTableEntryClosure* cl, uint worker_i);
+ void iterate_dirty_card_closure(G1CardTableEntryClosure* cl, uint worker_i);
// The shared block offset table array.
G1BlockOffsetTable* bot() const { return _bot; }