--- a/hotspot/src/share/vm/ci/ciEnv.cpp	Mon Oct 21 17:26:46 2013 -0700
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp	Tue Oct 22 14:29:02 2013 -0700
@@ -483,8 +483,7 @@
     {
       // We have to lock the cpool to keep the oop from being resolved
       // while we are accessing it.
-      oop cplock = cpool->lock();
-      ObjectLocker ol(cplock, THREAD, cplock != NULL);
+        MonitorLockerEx ml(cpool->lock());
       constantTag tag = cpool->tag_at(index);
       if (tag.is_klass()) {
         // The klass has been inserted into the constant pool