--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Wed Oct 16 11:52:56 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Wed Oct 16 12:36:44 2019 +0200
@@ -4076,7 +4076,7 @@
     Atomic::add(r->rem_set()->occupied_locked(), &_rs_length);
 
     if (!is_young) {
-      g1h->_hot_card_cache->reset_card_counts(r);
+      g1h->hot_card_cache()->reset_card_counts(r);
     }
 
     if (!evacuation_failed) {

--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Wed Oct 16 11:52:56 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Wed Oct 16 12:36:44 2019 +0200
@@ -129,7 +129,6 @@
 };
 
 class G1CollectedHeap : public CollectedHeap {
-  friend class G1FreeCollectionSetTask;
   friend class VM_CollectForMetadataAllocation;
   friend class VM_G1CollectForAllocation;
   friend class VM_G1CollectFull;
@@ -1138,7 +1137,7 @@
     return _reserved.contains(addr);
   }
 
-  G1HotCardCache* g1_hot_card_cache() const { return _hot_card_cache; }
+  G1HotCardCache* hot_card_cache() const { return _hot_card_cache; }
 
   G1CardTable* card_table() const {
     return _card_table;

--- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp	Wed Oct 16 11:52:56 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp	Wed Oct 16 12:36:44 2019 +0200
@@ -114,8 +114,9 @@
   hr->rem_set()->clear();
   hr->clear_cardtable();
 
-  if (_g1h->g1_hot_card_cache()->use_cache()) {
-    _g1h->g1_hot_card_cache()->reset_card_counts(hr);
+  G1HotCardCache* hcc = _g1h->hot_card_cache();
+  if (hcc->use_cache()) {
+    hcc->reset_card_counts(hr);
   }
 }