changeset in /hg/icedtea: 2009-03-13 Gary Benson <gbenson at redh...

[Gary Benson]

changeset ffdbfdce6b92 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ffdbfdce6b92
description:
	2009-03-13  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkInliner.cpp
		(SharkInlinerHelper::is_inlinable): An ior or lor of two
		known non-zero values creates a known non-zero value.
	(transplanted from 5a1daec06e6d581f55e5ad7ce38f37a5b7c86d41)

diffstat:

2 files changed, 22 insertions(+), 8 deletions(-)
ChangeLog                                         |    6 +++++
ports/hotspot/src/share/vm/shark/sharkInliner.cpp |   24 ++++++++++++++-------

diffs (62 lines):

diff -r f88af1647dad -r ffdbfdce6b92 ChangeLog
--- a/ChangeLog	Fri Mar 13 07:41:08 2009 -0400
+++ b/ChangeLog	Fri Mar 13 09:39:47 2009 -0400
@@ -1,3 +1,9 @@ 2009-03-13  Gary Benson  <gbenson at redhat
+2009-03-13  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp
+	(SharkInlinerHelper::is_inlinable): An ior or lor of two
+	known non-zero values creates a known non-zero value.
+
 2009-03-13  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/296:
diff -r f88af1647dad -r ffdbfdce6b92 ports/hotspot/src/share/vm/shark/sharkInliner.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkInliner.cpp	Fri Mar 13 07:41:08 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkInliner.cpp	Fri Mar 13 09:39:47 2009 -0400
@@ -513,7 +513,6 @@ bool SharkInlinerHelper::is_inlinable()
     case Bytecodes::_isub:
     case Bytecodes::_imul:
     case Bytecodes::_iand:
-    case Bytecodes::_ior:
     case Bytecodes::_ixor:
     case Bytecodes::_ishl:
     case Bytecodes::_ishr:
@@ -521,6 +520,11 @@ bool SharkInlinerHelper::is_inlinable()
       pop();
       pop();
       push(false);
+      break;
+    case Bytecodes::_ior:
+      a = pop();
+      b = pop();
+      push(a && b);
       break;
     case Bytecodes::_idiv:
     case Bytecodes::_irem:
@@ -536,14 +540,18 @@ bool SharkInlinerHelper::is_inlinable()
     case Bytecodes::_lsub:
     case Bytecodes::_lmul:
     case Bytecodes::_land:
+    case Bytecodes::_lxor:
+      pop();
+      pop();
+      pop();
+      pop();
+      push(false);
+      push(false);
+      break;
     case Bytecodes::_lor:
-    case Bytecodes::_lxor:
-      pop();
-      pop();
-      pop();
-      pop();
-      push(false);
-      push(false);
+      a = pop();
+      b = pop();
+      push(a && b);
       break;
     case Bytecodes::_ldiv:
     case Bytecodes::_lrem: