Mercurial > hg > truffle

changeset 1345:747d26efc5fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author twisti
date Tue, 30 Mar 2010 00:57:55 -0700
parents fdd57634910e
children 47742b654fcb f61d795ce6de
files src/cpu/zero/vm/cppInterpreter_zero.cpp
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Mar 18 14:31:41 2010 -0700
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Mar 30 00:57:55 2010 -0700
@@ -206,7 +206,6 @@
 
   // 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 @@
       if (HAS_PENDING_EXCEPTION)
         goto unwind_and_return;
     }
-    thread->clr_do_not_unlock();
   }
 
   // Lock if necessary