Mercurial > hg > truffle

comparison src/share/vm/classfile/systemDictionary.cpp @ 4981:1b8d02e10ee8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the hacks around "is_Compiler_thread" assertions; Graal no longer uses the compiler thread mechanisms; don't create a C++ compilation queue or any compiler threads.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 22:15:05 +0100
parents 33df1aeaebbf
children 957c266d8bc5
comparison
equal deleted inserted replaced
4980:1c7c5be93e84 4981:1b8d02e10ee8
191 191
192 192
193 // Forwards to resolve_instance_class_or_null 193 // Forwards to resolve_instance_class_or_null
194 194
195 klassOop SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS) { 195 klassOop SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS) {
196 // (tw) May we do this? 196 assert(!THREAD->is_Compiler_thread(), "Can not load classes with the Compiler thread");
197 //assert(!THREAD->is_Compiler_thread(), "Can not load classes with the Compiler thread");
198 if (FieldType::is_array(class_name)) { 197 if (FieldType::is_array(class_name)) {
199 return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); 198 return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL);
200 } else if (FieldType::is_obj(class_name)) { 199 } else if (FieldType::is_obj(class_name)) {
201 ResourceMark rm(THREAD); 200 ResourceMark rm(THREAD);
202 // Ignore wrapping L and ;. 201 // Ignore wrapping L and ;.
2368 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, name_id); 2367 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, name_id);
2369 methodHandle non_cached_result; 2368 methodHandle non_cached_result;
2370 if (spe == NULL || spe->property_oop() == NULL) { 2369 if (spe == NULL || spe->property_oop() == NULL) {
2371 spe = NULL; 2370 spe = NULL;
2372 // Must create lots of stuff here, but outside of the SystemDictionary lock. 2371 // Must create lots of stuff here, but outside of the SystemDictionary lock.
2373 // (tw) May we do this? 2372 if (THREAD->is_Compiler_thread())
2374 //if (THREAD->is_Compiler_thread()) 2373 return NULL; // do not attempt from within compiler
2375 // return NULL; // do not attempt from within compiler
2376 bool for_invokeGeneric = (name_id != vmSymbols::VM_SYMBOL_ENUM_NAME(invokeExact_name)); 2374 bool for_invokeGeneric = (name_id != vmSymbols::VM_SYMBOL_ENUM_NAME(invokeExact_name));
2377 bool found_on_bcp = false; 2375 bool found_on_bcp = false;
2378 Handle mt = find_method_handle_type(signature, accessing_klass, 2376 Handle mt = find_method_handle_type(signature, accessing_klass,
2379 for_invokeGeneric, 2377 for_invokeGeneric,
2380 found_on_bcp, CHECK_NULL); 2378 found_on_bcp, CHECK_NULL);