--- a/src/hotspot/share/gc/shared/copyFailedInfo.hpp	Tue May 15 11:28:29 2018 -0700
+++ b/src/hotspot/share/gc/shared/copyFailedInfo.hpp	Tue May 15 20:24:34 2018 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
 #define SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
 
+#include "jfr/support/jfrThreadId.hpp"
 #include "runtime/thread.hpp"
-#include "trace/traceMacros.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class CopyFailedInfo : public CHeapObj<mtGC> {
@@ -72,9 +72,9 @@
   void register_copy_failure(size_t size) {
     CopyFailedInfo::register_copy_failure(size);
     if (_thread_trace_id == 0) {
-      _thread_trace_id = THREAD_TRACE_ID(Thread::current());
+      _thread_trace_id = JFR_THREAD_ID(Thread::current());
     } else {
-      assert(THREAD_TRACE_ID(Thread::current()) == _thread_trace_id,
+      assert(JFR_THREAD_ID(Thread::current()) == _thread_trace_id,
         "The PromotionFailedInfo should be thread local.");
     }
   }