/hg/icedtea6: 2009-12-07 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset c18ada9920f7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c18ada9920f7
author: Gary Benson <gbenson at redhat.com>
date: Mon Dec 07 11:11:29 2009 -0500

	2009-12-07 Gary Benson <gbenson at redhat.com>

	 PR icedtea/416:
		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
	(CppInterpreter::native_entry): Always unlock synchronized
	native methods prior to returning.


diffstat:

2 files changed, 13 insertions(+), 6 deletions(-)
ChangeLog                                             |    7 +++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |   12 ++++++------

diffs (50 lines):

diff -r 1ac152b3ec07 -r c18ada9920f7 ChangeLog
--- a/ChangeLog	Thu Dec 03 13:55:11 2009 -0500
+++ b/ChangeLog	Mon Dec 07 11:11:29 2009 -0500
@@ -1,3 +1,10 @@ 2009-12-03  Man Lung Wong <mwong at redhat.
+2009-12-07  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/416:
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::native_entry): Always unlock synchronized
+	native methods prior to returning.
+
 2009-12-03  Man Lung Wong <mwong at redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
diff -r 1ac152b3ec07 -r c18ada9920f7 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Dec 03 13:55:11 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Dec 07 11:11:29 2009 -0500
@@ -245,7 +245,7 @@ void CppInterpreter::native_entry(method
     if (handlerAddr == NULL) {
       CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
       if (HAS_PENDING_EXCEPTION)
-        goto unwind_and_return;
+        goto unlock_unwind_and_return;
 
       handlerAddr = method->signature_handler();
       assert(handlerAddr != NULL, "eh?");
@@ -254,7 +254,7 @@ void CppInterpreter::native_entry(method
       CALL_VM_NOCHECK(handlerAddr =
         InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
       if (HAS_PENDING_EXCEPTION)
-        goto unwind_and_return;
+        goto unlock_unwind_and_return;
     }
     handler = \
       InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
@@ -365,10 +365,10 @@ void CppInterpreter::native_entry(method
   // Reset handle block
   thread->active_handles()->clear();
 
-  // Unlock if necessary.  It seems totally wrong that this
-  // is skipped in the event of an exception but apparently
-  // the template interpreter does this so we do too.
-  if (monitor && !HAS_PENDING_EXCEPTION) {
+ unlock_unwind_and_return:
+
+  // Unlock if necessary
+  if (monitor) {
     BasicLock *lock = monitor->lock();
     markOop header = lock->displaced_header();
     oop rcvr = monitor->obj();