diff -r 7a2a740815b7 -r caf115bb98ad src/hotspot/share/gc/shared/weakProcessor.cpp
--- a/src/hotspot/share/gc/shared/weakProcessor.cpp	Tue May 15 11:28:29 2018 -0700
+++ b/src/hotspot/share/gc/shared/weakProcessor.cpp	Tue May 15 20:24:34 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,15 @@
 #include "gc/shared/weakProcessor.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/jniHandles.hpp"
-#include "trace/tracing.hpp"
-#include "trace/traceMacros.hpp"
+#include "utilities/macros.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.hpp"
+#endif
 
 void WeakProcessor::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* keep_alive) {
   JNIHandles::weak_oops_do(is_alive, keep_alive);
   JvmtiExport::weak_oops_do(is_alive, keep_alive);
-  TRACE_WEAK_OOPS_DO(is_alive, keep_alive);
+  JFR_ONLY(Jfr::weak_oops_do(is_alive, keep_alive);)
 }
 
 void WeakProcessor::oops_do(OopClosure* closure) {