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

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::maybe_inline_call): Ensure the holder is
		linked before trying to inline accessors.

diffstat:

2 files changed, 10 insertions(+)
ChangeLog                                       |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |    4 ++++

diffs (27 lines):

diff -r 073c27894e5d -r f1cf5f359a35 ChangeLog
--- a/ChangeLog	Fri Feb 27 10:58:54 2009 -0500
+++ b/ChangeLog	Fri Feb 27 16:09:25 2009 +0000
@@ -1,3 +1,9 @@ 2009-02-27  Tomas Hurka  <tomas.hurka at su
+2009-02-27  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::maybe_inline_call): Ensure the holder is
+	linked before trying to inline accessors.
+
 2009-02-27  Tomas Hurka  <tomas.hurka at sun.com>
 
 	* Makefile.am: Removed redundant creation of netbeans dir.
diff -r 073c27894e5d -r f1cf5f359a35 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Feb 27 10:58:54 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Feb 27 16:09:25 2009 +0000
@@ -2095,6 +2095,10 @@ bool SharkBlock::maybe_inline_call(ciMet
   // now if the method is too big
   if (method->code_size() > 5)
     return false;
+
+  // If the holder isn't linked then there isn't a lot we can do
+  if (!method->holder()->is_linked())
+    return false;
   
   // Inspect the method's code to see if we can inline it.  We
   // don't use method->is_accessor() because that only spots