--- old/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp	2017-11-03 14:43:22.006633332 +0100
+++ new/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp	2017-11-03 14:43:21.618621375 +0100
@@ -33,7 +33,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 
-G1ConcurrentRefineThread::G1ConcurrentRefineThread(G1ConcurrentRefine* cg1r,
+G1ConcurrentRefineThread::G1ConcurrentRefineThread(G1ConcurrentRefine* cr,
                                                    G1ConcurrentRefineThread *next,
                                                    uint worker_id_offset,
                                                    uint worker_id,
@@ -45,7 +45,7 @@
   _active(false),
   _next(next),
   _monitor(NULL),
-  _cg1r(cg1r),
+  _cr(cr),
   _vtime_accum(0.0),
   _activation_threshold(activate),
   _deactivation_threshold(deactivate)
@@ -134,7 +134,7 @@
         size_t curr_buffer_num = dcqs.completed_buffers_num();
         // If the number of the buffers falls down into the yellow zone,
         // that means that the transition period after the evacuation pause has ended.
-        if (dcqs.completed_queue_padding() > 0 && curr_buffer_num <= cg1r()->yellow_zone()) {
+        if (dcqs.completed_queue_padding() > 0 && curr_buffer_num <= cr()->yellow_zone()) {
           dcqs.set_completed_queue_padding(0);
         }