--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Wed Aug 22 09:33:18 2018 -0700
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Tue Aug 28 12:57:40 2018 -0400
@@ -75,7 +75,7 @@
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
-#include "gc/shared/weakProcessor.hpp"
+#include "gc/shared/weakProcessor.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
@@ -3719,14 +3719,8 @@
   G1STWIsAliveClosure is_alive(this);
   G1KeepAliveClosure keep_alive(this);
 
-  {
-    double start = os::elapsedTime();
-
-    WeakProcessor::weak_oops_do(&is_alive, &keep_alive);
-
-    double time_ms = (os::elapsedTime() - start) * 1000.0;
-    g1_policy()->phase_times()->record_weak_ref_proc_time(time_ms);
-  }
+  WeakProcessor::weak_oops_do(workers(), &is_alive, &keep_alive,
+                              g1_policy()->phase_times()->weak_phase_times());
 
   if (G1StringDedup::is_enabled()) {
     double fixup_start = os::elapsedTime();