changeset 4767:107f15f2f32f

Merge
author asaha
date Tue, 30 Jul 2013 08:43:57 -0700
parents 2f9e4153cc9c 13edc330a937
children 1db90c27640c
files .hgtags make/hotspot_version
diffstat 3 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 29 11:58:33 2013 -0700
+++ b/.hgtags	Tue Jul 30 08:43:57 2013 -0700
@@ -557,6 +557,7 @@
 73863f836e343b4b8e3f018e5e8f7f1618529096 jdk7u25-b31
 dd9090ad552134cbb20d5dfc89f682f55e2570e9 jdk7u25-b33
 9af6a8fa6a557311bdf2fc124ae6adad59c9b78d jdk7u25-b34
+675a89fd4548389e3d54a29c6fe271d913e7eee6 hs24-b55
 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
 d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
--- a/src/share/vm/runtime/thread.cpp	Mon Jul 29 11:58:33 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Tue Jul 30 08:43:57 2013 -0700
@@ -332,6 +332,8 @@
   // Reclaim the objectmonitors from the omFreeList of the moribund thread.
   ObjectSynchronizer::omFlush (this) ;
 
+  THREAD_EXIT(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
--- a/src/share/vm/trace/traceMacros.hpp	Mon Jul 29 11:58:33 2013 -0700
+++ b/src/share/vm/trace/traceMacros.hpp	Tue Jul 30 08:43:57 2013 -0700
@@ -26,6 +26,7 @@
 #define SHARE_VM_TRACE_TRACE_MACRO_HPP
 
 #define EVENT_THREAD_EXIT(thread)
+#define THREAD_EXIT(thread)
 
 #define TRACE_INIT_ID(k)
 #define TRACE_DATA TraceThreadData