comparison src/share/vm/interpreter/rewriter.cpp @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents b8f261ba79c6 3efdfd6ddbf2
children 096c224171c4
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
82 // Creates a constant pool cache given a CPC map 82 // Creates a constant pool cache given a CPC map
83 void Rewriter::make_constant_pool_cache(TRAPS) { 83 void Rewriter::make_constant_pool_cache(TRAPS) {
84 const int length = _cp_cache_map.length(); 84 const int length = _cp_cache_map.length();
85 ClassLoaderData* loader_data = _pool->pool_holder()->class_loader_data(); 85 ClassLoaderData* loader_data = _pool->pool_holder()->class_loader_data();
86 ConstantPoolCache* cache = 86 ConstantPoolCache* cache =
87 ConstantPoolCache::allocate(loader_data, length, CHECK); 87 ConstantPoolCache::allocate(loader_data, length, _cp_cache_map,
88 _invokedynamic_references_map, CHECK);
88 89
89 // initialize object cache in constant pool 90 // initialize object cache in constant pool
90 _pool->initialize_resolved_references(loader_data, _resolved_references_map, 91 _pool->initialize_resolved_references(loader_data, _resolved_references_map,
91 _resolved_reference_limit, 92 _resolved_reference_limit,
92 CHECK); 93 CHECK);
93
94 No_Safepoint_Verifier nsv;
95 cache->initialize(_cp_cache_map, _invokedynamic_references_map);
96 _pool->set_cache(cache); 94 _pool->set_cache(cache);
97 cache->set_constant_pool(_pool()); 95 cache->set_constant_pool(_pool());
98 } 96 }
99 97
100 98