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

rev 13070 : [mq]: webrev.0a
rev 13071 : [mq]: webrev.1

@@ -1281,11 +1281,11 @@
       assert(num_free_regions() == 0, "we should not have added any free regions");
       rebuild_region_sets(false /* free_list_only */);
 
       // Enqueue any discovered reference objects that have
       // not been removed from the discovered lists.
-      ref_processor_stw()->enqueue_discovered_references();
+      ref_processor_stw()->enqueue_discovered_references(NULL, gc_timer);
 
 #if defined(COMPILER2) || INCLUDE_JVMCI
       DerivedPointerTable::update_pointers();
 #endif
 

@@ -4419,22 +4419,22 @@
 
   // Now enqueue any remaining on the discovered lists on to
   // the pending list.
   if (!rp->processing_is_mt()) {
     // Serial reference processing...
-    rp->enqueue_discovered_references();
+    rp->enqueue_discovered_references(NULL, _gc_timer_stw);
   } else {
     // Parallel reference enqueueing
 
     uint n_workers = workers()->active_workers();
 
     assert(n_workers <= rp->max_num_q(),
            "Mismatch between the number of GC workers %u and the maximum number of Reference process queues %u",
            n_workers,  rp->max_num_q());
 
     G1STWRefProcTaskExecutor par_task_executor(this, per_thread_states, workers(), _task_queues, n_workers);
-    rp->enqueue_discovered_references(&par_task_executor);
+    rp->enqueue_discovered_references(&par_task_executor, _gc_timer_stw);
   }
 
   rp->verify_no_references_recorded();
   assert(!rp->discovery_enabled(), "should have been disabled");