changeset in /hg/icedtea6: 2009-02-27 Gary Benson <gbenson at red...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::maybe_inline_call): Inline empty methods.

diffstat:

2 files changed, 14 insertions(+)
ChangeLog                                       |    5 +++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |    9 +++++++++

diffs (31 lines):

diff -r 29fdac532dd0 -r fd98e848b25c ChangeLog
--- a/ChangeLog	Thu Feb 26 15:40:28 2009 -0500
+++ b/ChangeLog	Fri Feb 27 04:08:04 2009 -0500
@@ -1,3 +1,8 @@ 2009-02-26  Deepak Bhole <dbhole at redhat.
+2009-02-27  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::maybe_inline_call): Inline empty methods.
+
 2009-02-26  Deepak Bhole <dbhole at redhat.com>
 
 	* IcedTeaPlugin.cc: Decode url via nsINetUtil::UnescapeString()
diff -r 29fdac532dd0 -r fd98e848b25c ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Thu Feb 26 15:40:28 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Feb 27 04:08:04 2009 -0500
@@ -2082,6 +2082,15 @@ bool SharkBlock::maybe_inline_call(ciMet
       method->has_monitor_bytecodes())
     return false;
 
+  // Inlining empty methods is trivial
+  if (method->is_empty_method()) {
+    int desired_stack_depth = xstack_depth() - method->arg_size();
+    while (xstack_depth() > desired_stack_depth)
+      pop();
+
+    return true;
+  } 
+  
   // We need to scan the bytecode to do any more, so we bail out
   // now if the method is too big
   if (method->code_size() > 5)