--- old/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-29 19:39:54.669576574 +0200
+++ new/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-29 19:39:54.399568297 +0200
@@ -62,7 +62,7 @@
 template <class T>
 inline void G1ScanClosureBase::handle_non_cset_obj_common(InCSetState const state, T* p, oop const obj) {
   if (state.is_humongous()) {
-    _g1->set_humongous_is_live(obj);
+    _g1h->set_humongous_is_live(obj);
   }
 }
 
@@ -74,7 +74,7 @@
     return;
   }
   oop obj = CompressedOops::decode_not_null(heap_oop);
-  const InCSetState state = _g1->in_cset_state(obj);
+  const InCSetState state = _g1h->in_cset_state(obj);
   if (state.is_in_cset()) {
     prefetch_and_push(p, obj);
   } else {
@@ -161,14 +161,14 @@
 
   check_obj_during_refinement(p, obj);
 
-  assert(!_g1->is_in_cset((HeapWord*)p), "Oop originates from " PTR_FORMAT " (region: %u) which is in the collection set.", p2i(p), _g1->addr_to_region((HeapWord*)p));
-  const InCSetState state = _g1->in_cset_state(obj);
+  assert(!_g1h->is_in_cset((HeapWord*)p), "Oop originates from " PTR_FORMAT " (region: %u) which is in the collection set.", p2i(p), _g1h->addr_to_region((HeapWord*)p));
+  const InCSetState state = _g1h->in_cset_state(obj);
   if (state.is_in_cset()) {
     // Since the source is always from outside the collection set, here we implicitly know
     // that this is a cross-region reference too.
     prefetch_and_push(p, obj);
   } else {
-    HeapRegion* to = _g1->heap_region_containing(obj);
+    HeapRegion* to = _g1h->heap_region_containing(obj);
     if (_from == to) {
       return;
     }
@@ -185,7 +185,7 @@
   }
   oop obj = CompressedOops::decode_not_null(heap_oop);
 
-  const InCSetState state = _g1->in_cset_state(obj);
+  const InCSetState state = _g1h->in_cset_state(obj);
   if (state.is_in_cset()) {
     prefetch_and_push(p, obj);
   } else {
@@ -197,13 +197,13 @@
 }
 
 void G1ParCopyHelper::do_cld_barrier(oop new_obj) {
-  if (_g1->heap_region_containing(new_obj)->is_young()) {
+  if (_g1h->heap_region_containing(new_obj)->is_young()) {
     _scanned_cld->record_modified_oops();
   }
 }
 
 void G1ParCopyHelper::mark_object(oop obj) {
-  assert(!_g1->heap_region_containing(obj)->in_collection_set(), "should not mark objects in the CSet");
+  assert(!_g1h->heap_region_containing(obj)->in_collection_set(), "should not mark objects in the CSet");
 
   // We know that the object is not moving so it's safe to read its size.
   _cm->mark_in_next_bitmap(_worker_id, obj);
@@ -214,8 +214,8 @@
   assert(from_obj->forwardee() == to_obj, "to obj should be the forwardee");
   assert(from_obj != to_obj, "should not be self-forwarded");
 
-  assert(_g1->heap_region_containing(from_obj)->in_collection_set(), "from obj should be in the CSet");
-  assert(!_g1->heap_region_containing(to_obj)->in_collection_set(), "should not mark objects in the CSet");
+  assert(_g1h->heap_region_containing(from_obj)->in_collection_set(), "from obj should be in the CSet");
+  assert(!_g1h->heap_region_containing(to_obj)->in_collection_set(), "should not mark objects in the CSet");
 
   // The object might be in the process of being copied by another
   // worker so we cannot trust that its to-space image is
@@ -237,7 +237,7 @@
 
   assert(_worker_id == _par_scan_state->worker_id(), "sanity");
 
-  const InCSetState state = _g1->in_cset_state(obj);
+  const InCSetState state = _g1h->in_cset_state(obj);
   if (state.is_in_cset()) {
     oop forwardee;
     markOop m = obj->mark();
@@ -259,7 +259,7 @@
     }
   } else {
     if (state.is_humongous()) {
-      _g1->set_humongous_is_live(obj);
+      _g1h->set_humongous_is_live(obj);
     }
 
     // The object is not in collection set. If we're a root scanning
@@ -280,7 +280,7 @@
     return;
   }
 
-  HeapRegion* to = _g1->heap_region_containing(obj);
+  HeapRegion* to = _g1h->heap_region_containing(obj);
   HeapRegionRemSet* rem_set = to->rem_set();
   rem_set->add_reference(p, _worker_id);
 }