Mercurial > hg > truffle

diff src/share/vm/graal/graalEnv.cpp @ 10409:36bcc10e01c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge fixes
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 15:37:32 +0200
parents fe9a18fbb15e
children 9c7d9e2c8326
line wrap: on
line diff
--- a/src/share/vm/graal/graalEnv.cpp	Wed Jun 19 10:45:56 2013 +0200
+++ b/src/share/vm/graal/graalEnv.cpp	Wed Jun 19 15:37:32 2013 +0200
@@ -172,7 +172,8 @@
     {
       // We have to lock the cpool to keep the oop from being resolved
       // while we are accessing it.
-      MutexLockerEx ml(cpool->lock(), Mutex::_no_safepoint_check_flag);
+      oop cplock = cpool->lock();
+      ObjectLocker ol(cplock, THREAD, cplock != NULL);
 
       constantTag tag = cpool->tag_at(index);
       if (tag.is_klass()) {