1.1 --- a/src/share/vm/interpreter/rewriter.cpp Thu Mar 07 14:06:44 2013 -0500 1.2 +++ b/src/share/vm/interpreter/rewriter.cpp Fri Mar 08 11:47:57 2013 -0500 1.3 @@ -84,15 +84,13 @@ 1.4 const int length = _cp_cache_map.length(); 1.5 ClassLoaderData* loader_data = _pool->pool_holder()->class_loader_data(); 1.6 ConstantPoolCache* cache = 1.7 - ConstantPoolCache::allocate(loader_data, length, CHECK); 1.8 + ConstantPoolCache::allocate(loader_data, length, _cp_cache_map, 1.9 + _invokedynamic_references_map, CHECK); 1.10 1.11 // initialize object cache in constant pool 1.12 _pool->initialize_resolved_references(loader_data, _resolved_references_map, 1.13 _resolved_reference_limit, 1.14 CHECK); 1.15 - 1.16 - No_Safepoint_Verifier nsv; 1.17 - cache->initialize(_cp_cache_map, _invokedynamic_references_map); 1.18 _pool->set_cache(cache); 1.19 cache->set_constant_pool(_pool()); 1.20 }