Mercurial > hg > truffle

comparison src/share/vm/ci/ciObjectFactory.cpp @ 4977:532be189cf09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reducing diff to hsx24
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 17:06:18 +0100
parents 04b9a2566eec
children 957c266d8bc5
comparison
equal deleted inserted replaced
4976:8f01f899bccd 4977:532be189cf09
85 _next_ident = _shared_ident_limit; 85 _next_ident = _shared_ident_limit;
86 _arena = arena; 86 _arena = arena;
87 _ci_objects = new (arena) GrowableArray<ciObject*>(arena, expected_size, 0, NULL); 87 _ci_objects = new (arena) GrowableArray<ciObject*>(arena, expected_size, 0, NULL);
88 88
89 // If the shared ci objects exist append them to this factory's objects 89 // If the shared ci objects exist append them to this factory's objects
90 90 #ifndef GRAAL
91 /*if (_shared_ci_objects != NULL) { 91 if (_shared_ci_objects != NULL) {
92 _ci_objects->appendAll(_shared_ci_objects); 92 _ci_objects->appendAll(_shared_ci_objects);
93 }*/ 93 }
94 #endif
94 95
95 _unloaded_methods = new (arena) GrowableArray<ciMethod*>(arena, 4, 0, NULL); 96 _unloaded_methods = new (arena) GrowableArray<ciMethod*>(arena, 4, 0, NULL);
96 _unloaded_klasses = new (arena) GrowableArray<ciKlass*>(arena, 8, 0, NULL); 97 _unloaded_klasses = new (arena) GrowableArray<ciKlass*>(arena, 8, 0, NULL);
97 _unloaded_instances = new (arena) GrowableArray<ciInstance*>(arena, 4, 0, NULL); 98 _unloaded_instances = new (arena) GrowableArray<ciInstance*>(arena, 4, 0, NULL);
98 _return_addresses = 99 _return_addresses =
217 _shared_ci_objects = _ci_objects; 218 _shared_ci_objects = _ci_objects;
218 } 219 }
219 220
220 221
221 ciSymbol* ciObjectFactory::get_symbol(Symbol* key) { 222 ciSymbol* ciObjectFactory::get_symbol(Symbol* key) {
222 /*vmSymbols::SID sid = vmSymbols::find_sid(key); 223 #ifndef GRAAL
224 vmSymbols::SID sid = vmSymbols::find_sid(key);
223 if (sid != vmSymbols::NO_SID) { 225 if (sid != vmSymbols::NO_SID) {
224 // do not pollute the main cache with it 226 // do not pollute the main cache with it
225 ciSymbol* result = vm_symbol_at(sid); 227 return vm_symbol_at(sid);
226 assert(result != NULL, ""); 228 }
227 return result; 229
228 }*/ 230 assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, "");
229 231 #endif
230 //assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, ""); 232
231 ciSymbol* s = new (arena()) ciSymbol(key, vmSymbols::NO_SID); 233 ciSymbol* s = new (arena()) ciSymbol(key, vmSymbols::NO_SID);
232 _symbols->push(s); 234 _symbols->push(s);
233 return s; 235 return s;
234 } 236 }
235 237