--- old/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-29 16:11:54.609699592 +0200
+++ new/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	2018-03-29 16:11:54.352691681 +0200
@@ -104,19 +104,19 @@
 template <class T>
 inline static void check_obj_during_refinement(T* p, oop const obj) {
 #ifdef ASSERT
-  G1CollectedHeap* g1 = G1CollectedHeap::heap();
+  G1CollectedHeap* g1h = G1CollectedHeap::heap();
   // can't do because of races
   // assert(oopDesc::is_oop_or_null(obj), "expected an oop");
   assert(check_obj_alignment(obj), "not oop aligned");
-  assert(g1->is_in_reserved(obj), "must be in heap");
+  assert(g1h->is_in_reserved(obj), "must be in heap");
 
-  HeapRegion* from = g1->heap_region_containing(p);
+  HeapRegion* from = g1h->heap_region_containing(p);
 
   assert(from != NULL, "from region must be non-NULL");
   assert(from->is_in_reserved(p) ||
          (from->is_humongous() &&
-          g1->heap_region_containing(p)->is_humongous() &&
-          from->humongous_start_region() == g1->heap_region_containing(p)->humongous_start_region()),
+          g1h->heap_region_containing(p)->is_humongous() &&
+          from->humongous_start_region() == g1h->heap_region_containing(p)->humongous_start_region()),
          "p " PTR_FORMAT " is not in the same region %u or part of the correct humongous object starting at region %u.",
          p2i(p), from->hrm_index(), from->humongous_start_region()->hrm_index());
 #endif // ASSERT