Mercurial > hg > graal-jvmci-8

comparison src/share/vm/oops/cpCache.cpp @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents a1ebd310d5c1
children b2e698d2276c
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
264 // Competing writers must acquire exclusive access via a lock. 264 // Competing writers must acquire exclusive access via a lock.
265 // A losing writer waits on the lock until the winner writes f1 and leaves 265 // A losing writer waits on the lock until the winner writes f1 and leaves
266 // the lock, so that when the losing writer returns, he can use the linked 266 // the lock, so that when the losing writer returns, he can use the linked
267 // cache entry. 267 // cache entry.
268 268
269 MonitorLockerEx ml(cpool->lock()); 269 oop cplock = cpool->lock();
270 ObjectLocker ol(cplock, Thread::current(), cplock != NULL);
270 if (!is_f1_null()) { 271 if (!is_f1_null()) {
271 return; 272 return;
272 } 273 }
273 274
274 const methodHandle adapter = call_info.resolved_method(); 275 const methodHandle adapter = call_info.resolved_method();
539 int length, 540 int length,
540 const intStack& index_map, 541 const intStack& index_map,
541 const intStack& invokedynamic_map, TRAPS) { 542 const intStack& invokedynamic_map, TRAPS) {
542 int size = ConstantPoolCache::size(length); 543 int size = ConstantPoolCache::size(length);
543 544
544 return new (loader_data, size, false, THREAD) ConstantPoolCache(length, index_map, invokedynamic_map); 545 return new (loader_data, size, false, MetaspaceObj::ConstantPoolCacheType, THREAD)
546 ConstantPoolCache(length, index_map, invokedynamic_map);
545 } 547 }
546 548
547 void ConstantPoolCache::initialize(const intArray& inverse_index_map, 549 void ConstantPoolCache::initialize(const intArray& inverse_index_map,
548 const intArray& invokedynamic_references_map) { 550 const intArray& invokedynamic_references_map) {
549 assert(inverse_index_map.length() == length(), "inverse index map must have same length as cache"); 551 assert(inverse_index_map.length() == length(), "inverse index map must have same length as cache");