stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6914050: jvm assertion "guard pages must be in use" in -Xcomp mode

Browse Source 
Move creating stack guard pages in jni attach thread before potential java call rather than after. Also cleanup stack guard pages when jni attach fails

Reviewed-by: never, dholmes
This commit is contained in:
Coleen Phillimore 2010-03-02 12:09:40 -08:00
parent cef423370c
commit 13ac3be829
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/src/share/vm/prims/jni.cpp
View File

@ -3401,12 +3401,16 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
thread->set_thread_state(_thread_in_vm); thread->set_thread_state(_thread_in_vm);
// Must do this before initialize_thread_local_storage // Must do this before initialize_thread_local_storage
thread->record_stack_base_and_size(); thread->record_stack_base_and_size();
thread->initialize_thread_local_storage(); thread->initialize_thread_local_storage();
if (!os::create_attached_thread(thread)) { if (!os::create_attached_thread(thread)) {
delete thread; delete thread;
return JNI_ERR; return JNI_ERR;
} }
// Enable stack overflow checks
thread->create_stack_guard_pages();
thread->initialize_tlab(); thread->initialize_tlab();
// Crucial that we do not have a safepoint check for this thread, since it has // Crucial that we do not have a safepoint check for this thread, since it has
@ -3452,9 +3456,6 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
// to regrab the threads_lock // to regrab the threads_lock
thread->set_attached(); thread->set_attached();
// Enable stack overflow checks
thread->create_stack_guard_pages();
// Set java thread status. // Set java thread status.
java_lang_Thread::set_thread_status(thread->threadObj(), java_lang_Thread::set_thread_status(thread->threadObj(),
java_lang_Thread::RUNNABLE); java_lang_Thread::RUNNABLE);

3
hotspot/src/share/vm/runtime/thread.cpp
View File

@ -1637,6 +1637,9 @@ void JavaThread::cleanup_failed_attach_current_thread() {
JNIHandleBlock::release_block(block); JNIHandleBlock::release_block(block);
} }
// These have to be removed while this is still a valid thread.
remove_stack_guard_pages();
if (UseTLAB) { if (UseTLAB) {
tlab().make_parsable(true); // retire TLAB, if any tlab().make_parsable(true); // retire TLAB, if any
} }