--- a/hotspot/src/share/vm/ci/ciEnv.cpp	Thu Apr 25 03:58:53 2013 -0700
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp	Thu Apr 25 12:55:49 2013 -0700
@@ -483,7 +483,8 @@
     {
       // We have to lock the cpool to keep the oop from being resolved
       // while we are accessing it.
-        MonitorLockerEx ml(cpool->lock());
+      oop cplock = cpool->lock();
+      ObjectLocker ol(cplock, THREAD, cplock != NULL);
       constantTag tag = cpool->tag_at(index);
       if (tag.is_klass()) {
         // The klass has been inserted into the constant pool