--- a/src/hotspot/share/gc/g1/g1RemSet.hpp Wed Apr 18 11:36:48 2018 +0200
+++ b/src/hotspot/share/gc/g1/g1RemSet.hpp Wed Apr 18 11:36:48 2018 +0200
@@ -69,7 +69,7 @@
// into the collection set or update the remembered set.
void update_rem_set(G1ParScanThreadState* pss, uint worker_i);
- G1CollectedHeap* _g1;
+ G1CollectedHeap* _g1h;
size_t _num_conc_refined_cards; // Number of cards refined concurrently to the mutator.
G1CardTable* _ct;
@@ -92,7 +92,7 @@
// scanned.
void cleanupHRRS();
- G1RemSet(G1CollectedHeap* g1,
+ G1RemSet(G1CollectedHeap* g1h,
G1CardTable* ct,
G1HotCardCache* hot_card_cache);
~G1RemSet();