Mercurial > hg > release > icedtea6-1.10

changeset 1569:797d59eaba38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-05-28 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp (SharkTopLevelBlock::do_return): Always call add_safepoint.
author Gary Benson <gbenson@redhat.com>
date Thu, 28 May 2009 16:56:19 +0100
parents fbb6b9fbb5a9
children 1c47ca6df830
files ChangeLog ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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@redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::do_return): Always call add_safepoint.
+
 2009-05-28  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
@@ -10,7 +15,7 @@
 	(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.
--- 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 @@
 {
   if (target()->intrinsic_id() == vmIntrinsics::_Object_init)
     call_register_finalizer(local(0)->jobject_value());
-  else
-    add_safepoint();
+  add_safepoint();
   handle_return(type, NULL);
 }