changeset in /hg/icedtea: 2009-06-02 Gary Benson <gbenson at redh...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
		(SharkTopLevelBlock::call_vm): Bugfix.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog                                               |    5 +++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |    2 +-

diffs (24 lines):

diff -r ef4d96a390a9 -r 1efa073c96fa ChangeLog
--- 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 at redhat
+2009-06-02  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::call_vm): Bugfix.
+
 2009-06-02  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
diff -r ef4d96a390a9 -r 1efa073c96fa 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 @@ class SharkTopLevelBlock : public SharkB
     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);
     }