# HG changeset patch
# User sspitsyn
# Date 1379116618 25200
# Node ID b135b600a66c1a7e76ff8d1645beab14dd2204af
# Parent  b89a1a870965c18f865e40510d030e98d02b499f# Parent  0d3ff4d36a3194fc8ac4c3cababa5193a6a62d63
Merge

diff -r 0d3ff4d36a31 -r b135b600a66c src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Fri Sep 13 12:48:50 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Fri Sep 13 16:56:58 2013 -0700
@@ -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 0d3ff4d36a31 -r b135b600a66c src/share/vm/trace/traceMacros.hpp
--- a/src/share/vm/trace/traceMacros.hpp	Fri Sep 13 12:48:50 2013 -0700
+++ b/src/share/vm/trace/traceMacros.hpp	Fri Sep 13 16:56:58 2013 -0700
@@ -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