# HG changeset patch
# User mgronlun
# Date 1379092859 -7200
# Node ID b89a1a870965c18f865e40510d030e98d02b499f
# Parent  225cedaf9a4b2377e94642a63601df535fbfe425# Parent  623d923529df6697a96a4984088eeafcb344bcd3
Merge

diff -r 225cedaf9a4b -r b89a1a870965 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Fri Sep 13 10:34:15 2013 -0400
+++ b/src/share/vm/runtime/thread.cpp	Fri Sep 13 19:20:59 2013 +0200
@@ -333,6 +333,8 @@
   // Reclaim the objectmonitors from the omFreeList of the moribund thread.
   ObjectSynchronizer::omFlush (this) ;
 
+  EVENT_THREAD_DESTRUCT(this);
+
   // stack_base can be NULL if the thread is never started or exited before
   // record_stack_base_and_size called. Although, we would like to ensure
   // that all started threads do call record_stack_base_and_size(), there is
diff -r 225cedaf9a4b -r b89a1a870965 src/share/vm/trace/traceMacros.hpp
--- a/src/share/vm/trace/traceMacros.hpp	Fri Sep 13 10:34:15 2013 -0400
+++ b/src/share/vm/trace/traceMacros.hpp	Fri Sep 13 19:20:59 2013 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_TRACE_TRACE_MACRO_HPP
 
 #define EVENT_THREAD_EXIT(thread)
+#define EVENT_THREAD_DESTRUCT(thread)
 
 #define TRACE_INIT_ID(k)
 #define TRACE_DATA TraceThreadData