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

6939180: Zero locking fix

Browse source 
When Zero is running with Shark enabled threads can be left with their _do_not_unlock_if_synchronized flag incorrectly set.

Reviewed-by: twisti
This commit is contained in:
Gary Benson 2010-03-30 00:57:55 -07:00 • committed by Christian Thalinger
parent 67c094c4c7
commit e76823e70b
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
View file

@ -206,7 +206,6 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
// Update the invocation counter // Update the invocation counter
if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) { if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
thread->set_do_not_unlock();
InvocationCounter *counter = method->invocation_counter(); InvocationCounter *counter = method->invocation_counter();
counter->increment(); counter->increment();
if (counter->reached_InvocationLimit()) { if (counter->reached_InvocationLimit()) {
@ -215,7 +214,6 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
if (HAS_PENDING_EXCEPTION) if (HAS_PENDING_EXCEPTION)
goto unwind_and_return; goto unwind_and_return;
} }
thread->clr_do_not_unlock();
} }
// Lock if necessary // Lock if necessary