Mercurial > hg > graal-jvmci-8
comparison src/share/vm/graal/graalEnv.cpp @ 10409:36bcc10e01c0
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 15:37:32 +0200 |
parents | fe9a18fbb15e |
children | 9c7d9e2c8326 |
comparison
equal
deleted
inserted
replaced
10408:836a62f43af9 | 10409:36bcc10e01c0 |
---|---|
170 // The klass has not been inserted into the constant pool. | 170 // The klass has not been inserted into the constant pool. |
171 // Try to look it up by name. | 171 // Try to look it up by name. |
172 { | 172 { |
173 // We have to lock the cpool to keep the oop from being resolved | 173 // We have to lock the cpool to keep the oop from being resolved |
174 // while we are accessing it. | 174 // while we are accessing it. |
175 MutexLockerEx ml(cpool->lock(), Mutex::_no_safepoint_check_flag); | 175 oop cplock = cpool->lock(); |
176 ObjectLocker ol(cplock, THREAD, cplock != NULL); | |
176 | 177 |
177 constantTag tag = cpool->tag_at(index); | 178 constantTag tag = cpool->tag_at(index); |
178 if (tag.is_klass()) { | 179 if (tag.is_klass()) { |
179 // The klass has been inserted into the constant pool | 180 // The klass has been inserted into the constant pool |
180 // very recently. | 181 // very recently. |