diff -r f8ebefc29b79 -r 162867fa0f8d src/hotspot/share/jfr/support/jfrThreadLocal.hpp
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp	Fri Jul 06 12:10:43 2018 -0700
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp	Sun Jul 08 11:54:08 2018 +0200
@@ -50,11 +50,14 @@
   unsigned int _stack_trace_hash;
   mutable u4 _stackdepth;
   volatile jint _entering_suspend_flag;
+  bool _dead;
 
   JfrBuffer* install_native_buffer() const;
   JfrBuffer* install_java_buffer() const;
   JfrStackFrame* install_stackframes() const;
 
+  void set_dead();
+
  public:
   JfrThreadLocal();
 
@@ -202,6 +205,10 @@
     _trace_id = id;
   }
 
+  bool is_dead() const {
+    return _dead;
+  }
+
   bool has_thread_checkpoint() const;
   void set_thread_checkpoint(const JfrCheckpointBlobHandle& handle);
   const JfrCheckpointBlobHandle& thread_checkpoint() const;