changeset in /hg/icedtea6: 2009-05-28 Gary Benson <gbenson at red...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
		(SharkTopLevelBlock::do_return): Always call add_safepoint.

diffstat:

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

diffs (34 lines):

diff -r fbb6b9fbb5a9 -r 797d59eaba38 ChangeLog
--- a/ChangeLog	Thu May 28 10:23:21 2009 -0400
+++ b/ChangeLog	Thu May 28 16:56:19 2009 +0100
@@ -1,3 +1,8 @@ 2009-05-28  Gary Benson  <gbenson at redhat
+2009-05-28  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::do_return): Always call add_safepoint.
+
 2009-05-28  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
@@ -10,7 +15,7 @@ 2009-05-28  Gary Benson  <gbenson at redhat
 	(SharkTopLevelBlock::release_lock): Likewise.
 	(SharkTopLevelBlock::call_vm_nocheck): Removed.
 
-	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
 	(SharkTopLevelBlock::check_pending_exception): Replace
 	boolean attempt_catch argument with an ExceptionAction.
 	(SharkTopLevelBlock::handle_exception): Likewise.
diff -r fbb6b9fbb5a9 -r 797d59eaba38 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Thu May 28 10:23:21 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Thu May 28 16:56:19 2009 +0100
@@ -720,8 +720,7 @@ void SharkTopLevelBlock::do_return(Basic
 {
   if (target()->intrinsic_id() == vmIntrinsics::_Object_init)
     call_register_finalizer(local(0)->jobject_value());
-  else
-    add_safepoint();
+  add_safepoint();
   handle_return(type, NULL);
 }