src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 9080 : imported patch move-code
rev 9081 : imported patch rootclosureset
rev 9083 : imported patch erik-review

@@ -4429,15 +4429,11 @@
       ReferenceProcessor*             rp = _g1h->ref_processor_stw();
 
       G1ParScanThreadState*           pss = _pss->state_for_worker(worker_id);
       pss->set_ref_processor(rp);
 
-      bool trace_metadata = false;
-
-      if (_g1h->collector_state()->during_initial_mark_pause() && ClassUnloadingWithConcurrentMark) {
-        trace_metadata = true;
-      }
+      bool trace_metadata = _g1h->collector_state()->during_initial_mark_pause() && ClassUnloadingWithConcurrentMark;
 
       double start_strong_roots_sec = os::elapsedTime();
       _root_processor->evacuate_roots(pss->closures(),
                                       trace_metadata,
                                       worker_id);