--- old/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	2018-04-16 16:08:42.128924368 +0200
+++ new/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp	2018-04-16 16:08:41.862916211 +0200
@@ -994,7 +994,7 @@
   verifier->verify_region_sets_optional();
 
   if (VerifyDuringGC) {
-    GCTraceTime(Debug, gc, phases) trace(caller, _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug(caller, _gc_timer_cm);
 
     size_t const BufLen = 512;
     char buffer[BufLen];
@@ -1109,7 +1109,7 @@
   verify_during_pause(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UsePrevMarking, "Remark before");
 
   {
-    GCTraceTime(Debug, gc, phases) trace("Finalize Marking", _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug("Finalize Marking", _gc_timer_cm);
     finalize_marking();
   }
 
@@ -1127,27 +1127,27 @@
                                        true /* expected_active */);
 
     {
-      GCTraceTime(Debug, gc, phases) trace("Flush Task Caches", _gc_timer_cm);
+      GCTraceTime(Debug, gc, phases) debug("Flush Task Caches", _gc_timer_cm);
       flush_all_task_caches();
     }
 
     // Install newly created mark bitmap as "prev".
     swap_mark_bitmaps();
     {
-      GCTraceTime(Debug, gc, phases) trace("Update Remembered Set Tracking Before Rebuild", _gc_timer_cm);
+      GCTraceTime(Debug, gc, phases) debug("Update Remembered Set Tracking Before Rebuild", _gc_timer_cm);
       G1UpdateRemSetTrackingBeforeRebuild cl(_g1h, this);
       _g1h->heap_region_iterate(&cl);
       log_debug(gc, remset, tracking)("Remembered Set Tracking update regions total %u, selected %u",
                                       _g1h->num_regions(), cl.num_selected_for_rebuild());
     }
     {
-      GCTraceTime(Debug, gc, phases) trace("Reclaim Empty Regions", _gc_timer_cm);
+      GCTraceTime(Debug, gc, phases) debug("Reclaim Empty Regions", _gc_timer_cm);
       reclaim_empty_regions();
     }
 
     // Clean out dead classes
     if (ClassUnloadingWithConcurrentMark) {
-      GCTraceTime(Debug, gc, phases) trace("Purge Metaspace", _gc_timer_cm);
+      GCTraceTime(Debug, gc, phases) debug("Purge Metaspace", _gc_timer_cm);
       ClassLoaderDataGraph::purge();
     }
 
@@ -1170,7 +1170,7 @@
   }
 
   {
-    GCTraceTime(Debug, gc, phases) trace("Report Object Count", _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug("Report Object Count", _gc_timer_cm);
     report_object_count(mark_finished);
   }
 
@@ -1318,7 +1318,7 @@
   verify_during_pause(G1HeapVerifier::G1VerifyCleanup, VerifyOption_G1UsePrevMarking, "Cleanup before");
 
   {
-    GCTraceTime(Debug, gc, phases) trace("Update Remembered Set Tracking After Rebuild", _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug("Update Remembered Set Tracking After Rebuild", _gc_timer_cm);
     G1UpdateRemSetTrackingAfterRebuild cl(_g1h);
     _g1h->heap_region_iterate(&cl);
   }
@@ -1340,7 +1340,7 @@
   _cleanup_times.add(recent_cleanup_time);
 
   {
-    GCTraceTime(Debug, gc, phases) trace("Finalize Concurrent Mark Cleanup", _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug("Finalize Concurrent Mark Cleanup", _gc_timer_cm);
     _g1h->g1_policy()->record_concurrent_mark_cleanup_end();
   }
 }
@@ -1566,7 +1566,7 @@
   // Inner scope to exclude the cleaning of the string and symbol
   // tables from the displayed time.
   {
-    GCTraceTime(Debug, gc, phases) trace("Reference Processing", _gc_timer_cm);
+    GCTraceTime(Debug, gc, phases) debug("Reference Processing", _gc_timer_cm);
 
     ReferenceProcessor* rp = _g1h->ref_processor_cm();
 
@@ -1991,7 +1991,7 @@
   // Clear all marks in the next bitmap for the next marking cycle. This will allow us to skip the next
   // concurrent bitmap clearing.
   {
-    GCTraceTime(Debug, gc)("Clear Next Bitmap");
+    GCTraceTime(Debug, gc) debug("Clear Next Bitmap");
     clear_bitmap(_next_mark_bitmap, _g1h->workers(), false);
   }
   // Note we cannot clear the previous marking bitmap here