changeset in /hg/icedtea6: 2008-10-23 Gary Benson <gbenson at red...

[Gary Benson]

changeset 6ce8e4006dd4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6ce8e4006dd4
description:
	2008-10-23  Gary Benson  <gbenson at redhat.com>

		PR icedtea/229:
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::parse): Parse goto_w correctly.

diffstat:

2 files changed, 11 insertions(+), 1 deletion(-)
ChangeLog                                       |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |    6 +++++-

diffs (36 lines):

diff -r 0fafece1a73c -r 6ce8e4006dd4 ChangeLog
--- a/ChangeLog	Thu Oct 23 12:17:21 2008 +0200
+++ b/ChangeLog	Thu Oct 23 10:31:07 2008 -0400
@@ -1,3 +1,9 @@ 2008-10-23  Mark Wielaard  <mark at klomp.o
+2008-10-23  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/229:
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Parse goto_w correctly.
+
 2008-10-23  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (stamps/patch.stamp): Make sure rt dir exists when
diff -r 0fafece1a73c -r 6ce8e4006dd4 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Thu Oct 23 12:17:21 2008 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Thu Oct 23 10:31:07 2008 -0400
@@ -140,7 +140,6 @@ void SharkBlock::parse()
 
       switch (bc()) {
       case Bytecodes::_goto:
-      case Bytecodes::_goto_w:
       case Bytecodes::_ifnull:
       case Bytecodes::_ifnonnull:
       case Bytecodes::_if_acmpeq:
@@ -158,6 +157,11 @@ void SharkBlock::parse()
       case Bytecodes::_if_icmpgt:
       case Bytecodes::_if_icmpge:
         if (iter()->get_dest() <= bci())
+          add_safepoint();
+        break;
+
+      case Bytecodes::_goto_w:
+        if (iter()->get_far_dest() <= bci())
           add_safepoint();
         break;