--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp	Thu Aug 10 12:16:35 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp	Thu Aug 10 18:09:19 2017 -0700
@@ -298,7 +298,7 @@
                                                          size_t size,
                                                          size_t translation_factor);
 
-  static G1Policy* create_g1_policy();
+  static G1Policy* create_g1_policy(STWGCTimer* gc_timer);
 
   void trace_heap(GCWhen::Type when, const GCTracer* tracer);
 
@@ -370,6 +370,10 @@
   G1EdenRegions _eden;
   G1SurvivorRegions _survivor;
 
+  STWGCTimer* _gc_timer_stw;
+
+  G1NewTracer* _gc_tracer_stw;
+
   // The current policy object for the collector.
   G1Policy* _g1_policy;
   G1HeapSizingPolicy* _heap_sizing_policy;
@@ -901,10 +905,6 @@
   // The (stw) reference processor...
   ReferenceProcessor* _ref_processor_stw;
 
-  STWGCTimer* _gc_timer_stw;
-
-  G1NewTracer* _gc_tracer_stw;
-
   // During reference object discovery, the _is_alive_non_header
   // closure (if non-null) is applied to the referent object to
   // determine whether the referent is live. If so then the