changeset in /hg/icedtea6: 2009-06-02 Gary Benson <gbenson at red...

[Gary Benson]

changeset e01a6da1a425 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e01a6da1a425
description:
	2009-06-02  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
		(SharkTopLevelBlock::release_lock): Bugfix.
		(SharkTopLevelBlock::check_pending_exception): Updated
		comment to account for the above.

diffstat:

2 files changed, 10 insertions(+), 6 deletions(-)
ChangeLog                                               |    7 +++++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |    9 +++------

diffs (40 lines):

diff -r 44cd62d979db -r e01a6da1a425 ChangeLog
--- a/ChangeLog	Tue Jun 02 15:30:30 2009 +0100
+++ b/ChangeLog	Tue Jun 02 15:41:45 2009 +0100
@@ -1,3 +1,10 @@ 2009-06-02  Gary Benson  <gbenson at redhat
+2009-06-02  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::release_lock): Bugfix.
+	(SharkTopLevelBlock::check_pending_exception): Updated
+	comment to account for the above.
+
 2009-06-02  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
diff -r 44cd62d979db -r e01a6da1a425 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Tue Jun 02 15:30:30 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Tue Jun 02 15:41:45 2009 +0100
@@ -351,9 +351,8 @@ void SharkTopLevelBlock::check_pending_e
   SharkState *saved_state = current_state()->copy();
   if (action & EAM_MONITOR_FUDGE) {
     // The top monitor is marked live, but the exception was thrown
-    // while setting it up or tearing it down.  We need to mark it
-    // dead before we enter any exception handlers as they will not
-    // expect it to be there.
+    // while setting it up so we need to mark it dead before we enter
+    // any exception handlers as they will not expect it to be there.
     set_num_monitors(num_monitors() - 1);
     action ^= EAM_MONITOR_FUDGE;
   }
@@ -1766,9 +1765,7 @@ void SharkTopLevelBlock::release_lock(in
 
   // Need to drop into the runtime to release this one
   builder()->SetInsertPoint(slow_path);
-  call_vm(
-    SharkRuntime::monitorexit(), monitor_addr,
-    exception_action | EAM_MONITOR_FUDGE);
+  call_vm(SharkRuntime::monitorexit(), monitor_addr, exception_action);
   BasicBlock *released_slow = builder()->GetInsertBlock();
   builder()->CreateBr(lock_released);