Mercurial > hg > release > icedtea6-1.8

changeset 1149:6ce8e4006dd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-10-23 Gary Benson <gbenson@redhat.com> PR icedtea/229: * ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::parse): Parse goto_w correctly.
author Gary Benson <gbenson@redhat.com>
date Thu, 23 Oct 2008 10:31:07 -0400
parents 0fafece1a73c
children 19ff33216eaf
files ChangeLog ports/hotspot/src/share/vm/shark/sharkBlock.cpp
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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  Gary Benson  <gbenson@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@klomp.org>
 
 	* Makefile.am (stamps/patch.stamp): Make sure rt dir exists when
--- 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 @@
 
       switch (bc()) {
       case Bytecodes::_goto:
-      case Bytecodes::_goto_w:
       case Bytecodes::_ifnull:
       case Bytecodes::_ifnonnull:
       case Bytecodes::_if_acmpeq:
@@ -161,6 +160,11 @@
           add_safepoint();
         break;
 
+      case Bytecodes::_goto_w:
+        if (iter()->get_far_dest() <= bci())
+          add_safepoint();
+        break;
+
       case Bytecodes::_tableswitch:
       case Bytecodes::_lookupswitch:
         if (switch_default_dest() <= bci()) {