--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp	2019-02-27 11:07:47.886184582 +0100
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp	2019-02-27 11:07:47.615176342 +0100
@@ -48,7 +48,7 @@
     _closures(NULL),
     _plab_allocator(NULL),
     _age_table(false),
-    _tenuring_threshold(g1h->g1_policy()->tenuring_threshold()),
+    _tenuring_threshold(g1h->policy()->tenuring_threshold()),
     _scanner(g1h, this),
     _worker_id(worker_id),
     _stack_trim_upper_threshold(GCDrainStackTargetSize * 2 + 1),
@@ -91,7 +91,7 @@
   _dcq.flush();
   // Update allocation statistics.
   _plab_allocator->flush_and_retire_stats();
-  _g1h->g1_policy()->record_age_table(&_age_table);
+  _g1h->policy()->record_age_table(&_age_table);
 
   uint length = _g1h->collection_set()->young_region_length();
   for (uint region_index = 0; region_index < length; region_index++) {
@@ -372,7 +372,7 @@
     }
 
     size_t used_memory = pss->oops_into_optional_region(hr)->used_memory();
-    _g1h->g1_policy()->phase_times()->record_or_add_thread_work_item(G1GCPhaseTimes::OptScanRS, worker_index, used_memory, G1GCPhaseTimes::OptCSetUsedMemory);
+    _g1h->policy()->phase_times()->record_or_add_thread_work_item(G1GCPhaseTimes::OptScanRS, worker_index, used_memory, G1GCPhaseTimes::OptCSetUsedMemory);
   }
 }