Mercurial > hg > release > icedtea-1.9
changeset 1699:4c8900e76d94
2009-02-27 Gary Benson <gbenson@redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
(SharkBlock::maybe_inline_call): Ensure the holder is
linked before trying to inline accessors.
(transplanted from f1cf5f359a35e11d836abcd095f7e2be7c4a5647)
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Fri, 27 Feb 2009 16:09:25 +0000 |
| parents | 8dec00360b24 |
| children | edf6c7397cc7 |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkBlock.cpp |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 27 10:58:54 2009 -0500 +++ b/ChangeLog Fri Feb 27 16:09:25 2009 +0000 @@ -69,6 +69,12 @@ * patches/hotspot/original/icedtea-includedb.patch, * patches/icedtea-libraries.patch: Recreated. +2009-02-27 Gary Benson <gbenson@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@sun.com> * Makefile.am: Removed redundant creation of netbeans dir.
--- 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 @@ // 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