archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6583275: Hotspot crash in vm_perform_shutdown_actions due to uninitialized TLS during out of memory handling

Browse source 
Call get_thread_slow() in vm_perform_shutdown actions and add null check.

Reviewed-by: kvn, dholmes, jcoomes
This commit is contained in:
Coleen Phillimore 2011-01-05 21:23:15 -05:00
parent dec384330b
commit 1f42cca35e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/src/share/vm/runtime/java.cpp
View file

@ -515,8 +515,8 @@ void before_exit(JavaThread * thread) {
} }
void vm_exit(int code) { void vm_exit(int code) {
Thread* thread = ThreadLocalStorage::thread_index() == -1 ? NULL Thread* thread = ThreadLocalStorage::is_initialized() ?
: ThreadLocalStorage::get_thread_slow(); ThreadLocalStorage::get_thread_slow() : NULL;
if (thread == NULL) { if (thread == NULL) {
// we have serious problems -- just exit // we have serious problems -- just exit
vm_direct_exit(code); vm_direct_exit(code);
@ -553,8 +553,9 @@ void vm_perform_shutdown_actions() {
// Calling 'exit_globals()' will disable thread-local-storage and cause all // Calling 'exit_globals()' will disable thread-local-storage and cause all
// kinds of assertions to trigger in debug mode. // kinds of assertions to trigger in debug mode.
if (is_init_completed()) { if (is_init_completed()) {
Thread* thread = Thread::current(); Thread* thread = ThreadLocalStorage::is_initialized() ?
if (thread->is_Java_thread()) { ThreadLocalStorage::get_thread_slow() : NULL;
if (thread != NULL && thread->is_Java_thread()) {
// We are leaving the VM, set state to native (in case any OS exit // We are leaving the VM, set state to native (in case any OS exit
// handlers call back to the VM) // handlers call back to the VM)
JavaThread* jt = (JavaThread*)thread; JavaThread* jt = (JavaThread*)thread;