--- old/src/hotspot/share/gc/g1/g1OopClosures.cpp	2018-03-29 19:40:28.175603741 +0200
+++ new/src/hotspot/share/gc/g1/g1OopClosures.cpp	2018-03-29 19:40:27.922595985 +0200
@@ -30,16 +30,16 @@
 #include "memory/iterator.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
-G1ParCopyHelper::G1ParCopyHelper(G1CollectedHeap* g1,  G1ParScanThreadState* par_scan_state) :
-  _g1(g1),
+G1ParCopyHelper::G1ParCopyHelper(G1CollectedHeap* g1h,  G1ParScanThreadState* par_scan_state) :
+  _g1h(g1h),
   _par_scan_state(par_scan_state),
   _worker_id(par_scan_state->worker_id()),
   _scanned_cld(NULL),
-  _cm(_g1->concurrent_mark())
+  _cm(_g1h->concurrent_mark())
 { }
 
-G1ScanClosureBase::G1ScanClosureBase(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
-  _g1(g1), _par_scan_state(par_scan_state), _from(NULL)
+G1ScanClosureBase::G1ScanClosureBase(G1CollectedHeap* g1h, G1ParScanThreadState* par_scan_state) :
+  _g1h(g1h), _par_scan_state(par_scan_state), _from(NULL)
 { }
 
 void G1CLDScanClosure::do_cld(ClassLoaderData* cld) {