From 84c0cbd9be85dc35163e9507ad9713abcd7f4821 Mon Sep 17 00:00:00 2001
From: twisti <unknown>
Date: Tue, 30 Mar 2010 00:57:55 -0700
Subject: [PATCH] 6939180: Zero locking fix Summary: When Zero is running with
 Shark enabled threads can be left with their _do_not_unlock_if_synchronized
 flag incorrectly set. Reviewed-by: twisti Contributed-by: Gary Benson
 <gbenson@redhat.com>

---
 src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cpu/zero/vm/cppInterpreter_zero.cpp b/src/cpu/zero/vm/cppInterpreter_zero.cpp
index 4f94d8851..47a305cdf 100644
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -206,7 +206,6 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
 
   // Update the invocation counter
   if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
-    thread->set_do_not_unlock();
     InvocationCounter *counter = method->invocation_counter();
     counter->increment();
     if (counter->reached_InvocationLimit()) {
@@ -215,7 +214,6 @@ void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS) {
       if (HAS_PENDING_EXCEPTION)
         goto unwind_and_return;
     }
-    thread->clr_do_not_unlock();
   }
 
   // Lock if necessary
-- 
GitLab