Mercurial > hg > release > icedtea6-1.10

changeset 1574:44cd62d979db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-06-02 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::call_vm): Bugfix.
author Gary Benson <gbenson@redhat.com>
date Tue, 02 Jun 2009 15:30:30 +0100
parents b7825ac40fd9
children e01a6da1a425
files ChangeLog ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 02 15:14:15 2009 +0100
+++ b/ChangeLog	Tue Jun 02 15:30:30 2009 +0100
@@ -1,3 +1,8 @@
+2009-06-02  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::call_vm): Bugfix.
+
 2009-06-02  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Tue Jun 02 15:14:15 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Tue Jun 02 15:30:30 2009 +0100
@@ -263,7 +263,7 @@
     llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end);
     function()->reset_last_Java_frame();
     current_state()->cache_after_VM_call();
-    if (exception_action) {
+    if (exception_action & EAM_CHECK) {
       check_pending_exception(exception_action);
       current_state()->set_has_safepointed(true);
     }