changeset in /hg/icedtea6: 2009-06-05 Gary Benson <gbenson at red...

[Gary Benson]

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

		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
		(SharkTopLevelBlock::acquire_method_lock): Removed constant
		pool lookup.

diffstat:

2 files changed, 13 insertions(+), 7 deletions(-)
ChangeLog                                               |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |   14 +++++++-------

diffs (38 lines):

diff -r 4dbf479c5609 -r 20de96630f3a ChangeLog
--- a/ChangeLog	Fri Jun 05 06:47:14 2009 -0400
+++ b/ChangeLog	Fri Jun 05 12:12:00 2009 +0100
@@ -1,3 +1,9 @@ 2009-06-05  Gary Benson  <gbenson at redhat
+2009-06-05  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::acquire_method_lock): Removed constant
+	pool lookup.
+
 2009-06-05  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
diff -r 4dbf479c5609 -r 20de96630f3a ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Fri Jun 05 06:47:14 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Fri Jun 05 12:12:00 2009 +0100
@@ -1563,14 +1563,14 @@ void SharkTopLevelBlock::do_multianewarr
 
 void SharkTopLevelBlock::acquire_method_lock()
 {
+  Value *lockee;
+  if (target()->is_static())
+    lockee = builder()->CreateInlineOop(target()->holder()->java_mirror());
+  else
+    lockee = local(0)->jobject_value();
+
   iter()->force_bci(start()); // for the decache in acquire_lock
-  if (target()->is_static()) {
-    SharkConstantPool constants(this);
-    acquire_lock(constants.java_mirror(), EX_CHECK_NO_CATCH);
-  }
-  else {
-    acquire_lock(local(0)->jobject_value(), EX_CHECK_NO_CATCH);
-  }
+  acquire_lock(lockee, EX_CHECK_NO_CATCH);
 }
 
 void SharkTopLevelBlock::do_monitorenter()