Mercurial > hg > release > icedtea8-3.0
changeset 2337:f4d94ae8a6ae
Match Shark in icedtea6, makes OSR work by removing vestigal check.
2010-08-05 Xerxes R?nby <xerxes@zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
(SharkOSREntryCacher::process_monitor): Match Shark in icedtea6,
makes OSR work by removing vestigal check.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 05 Aug 2010 11:35:15 +0200 |
| parents | a90ef7cbbb61 |
| children | e93b9abe3db7 |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 29 11:27:27 2010 +0100 +++ b/ChangeLog Thu Aug 05 11:35:15 2010 +0200 @@ -1,3 +1,9 @@ +2010-08-05 Xerxes Rånby <xerxes@zafena.se> + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkOSREntryCacher::process_monitor): Match Shark in icedtea6, + makes OSR work by removing vestigal check. + 2010-07-29 Andrew John Hughes <ahughes@redhat.com> * NEWS: Add 1.14 section.
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Jul 29 11:27:27 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Aug 05 11:35:15 2010 +0200 @@ -179,9 +179,6 @@ void SharkOSREntryCacher::process_monitor(int index, int box_offset, int obj_offset) { - if (max_monitors() > 1) - Unimplemented(); // XXX which order will they be in? - // Copy the monitor from the OSR buffer to the frame int src_offset = max_locals() + index * 2; builder()->CreateStore(