Mercurial > hg > release > icedtea6-1.10
changeset 1575:e01a6da1a425
2009-06-02 Gary Benson <gbenson@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.
author | Gary Benson <gbenson@redhat.com> |
---|---|
date | Tue, 02 Jun 2009 15:41:45 +0100 |
parents | 44cd62d979db |
children | 6bbac4cbc210 |
files | ChangeLog ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |
diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- 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 @@ 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 @@ // 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);