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

6908267: Zero fails to unlock synchronized native methods on exception

Browse Source 
Reviewed-by: never
This commit is contained in:
Gary Benson 2010-01-05 11:14:54 -08:00 committed by Tom Rodriguez
parent caf28727eb
commit 99b489b4f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
View File

@ -245,7 +245,7 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
if (handlerAddr == NULL) { if (handlerAddr == NULL) {
CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method)); CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
if (HAS_PENDING_EXCEPTION) if (HAS_PENDING_EXCEPTION)
goto unwind_and_return; goto unlock_unwind_and_return;
handlerAddr = method->signature_handler(); handlerAddr = method->signature_handler();
assert(handlerAddr != NULL, "eh?"); assert(handlerAddr != NULL, "eh?");
@ -254,7 +254,7 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
CALL_VM_NOCHECK(handlerAddr = CALL_VM_NOCHECK(handlerAddr =
InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL)); InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
if (HAS_PENDING_EXCEPTION) if (HAS_PENDING_EXCEPTION)
goto unwind_and_return; goto unlock_unwind_and_return;
} }
handler = \ handler = \
InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr); InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
@ -365,10 +365,10 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
// Reset handle block // Reset handle block
thread->active_handles()->clear(); thread->active_handles()->clear();
// Unlock if necessary. It seems totally wrong that this unlock_unwind_and_return:
// is skipped in the event of an exception but apparently
// the template interpreter does this so we do too. // Unlock if necessary
if (monitor && !HAS_PENDING_EXCEPTION) { if (monitor) {
BasicLock *lock = monitor->lock(); BasicLock *lock = monitor->lock();
markOop header = lock->displaced_header(); markOop header = lock->displaced_header();
oop rcvr = monitor->obj(); oop rcvr = monitor->obj();