/hg/icedtea: Match Shark in icedtea6, makes OSR work by removing...

[xranby at icedtea.classpath.org]

changeset f4d94ae8a6ae in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f4d94ae8a6ae
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Aug 05 11:35:15 2010 +0200

	Match Shark in icedtea6, makes OSR work by removing vestigal check.

	2010-08-05 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
	(SharkOSREntryCacher::process_monitor): Match Shark in icedtea6,
	makes OSR work by removing vestigal check.


diffstat:

2 files changed, 6 insertions(+), 3 deletions(-)
ChangeLog                                              |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp |    3 ---

diffs (26 lines):

diff -r a90ef7cbbb61 -r f4d94ae8a6ae ChangeLog
--- 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-07-29  Andrew John Hughes  <ahughes
+2010-08-05  Xerxes RÃ¥nby  <xerxes at 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 at redhat.com>
 
 	* NEWS: Add 1.14 section.
diff -r a90ef7cbbb61 -r f4d94ae8a6ae ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- 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_monito
 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(