--- old/src/share/vm/gc_implementation/g1/g1RootProcessor.hpp	2015-03-18 09:47:45.575127578 +0100
+++ new/src/share/vm/gc_implementation/g1/g1RootProcessor.hpp	2015-03-18 09:47:45.491124144 +0100
@@ -50,7 +50,6 @@
   // Used to implement the Thread work barrier.
   Monitor _lock;
   volatile jint _n_workers_discovered_strong_classes;
-  const bool _trace_metadata;
 
   enum G1H_process_roots_tasks {
     G1RP_PS_Universe_oops_do,
@@ -81,7 +80,7 @@
                         OopClosure* scan_non_heap_weak_roots);
 
 public:
-  G1RootProcessor(G1CollectedHeap* g1h, bool trace_metadata);
+  G1RootProcessor(G1CollectedHeap* g1h);
 
   // Apply closures to the strongly and weakly reachable roots in the system
   // in a single pass.
@@ -90,6 +89,7 @@
                       OopClosure* scan_non_heap_weak_roots,
                       CLDClosure* scan_strong_clds,
                       CLDClosure* scan_weak_clds,
+                      bool trace_metadata,
                       uint worker_i);
 
   // Apply oops, clds and blobs to all strongly reachable roots in the system