Mercurial > hg > truffle
diff src/share/vm/ci/ciEnv.cpp @ 12946:b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
Summary: Revert changes in JDK-8008962
Reviewed-by: coleenp, sspitsyn
author | iklam |
---|---|
date | Tue, 22 Oct 2013 14:29:02 -0700 |
parents | 5cc2d82aa82a |
children | e2509677809c |
line wrap: on
line diff
--- a/src/share/vm/ci/ciEnv.cpp Mon Oct 21 17:26:46 2013 -0700 +++ b/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