< prev index next >
src/hotspot/share/interpreter/linkResolver.cpp
Print this page
rev 51756 : 8205611: Improve the wording of LinkageErrors to include module and class loader information
Summary: Clean up the wording of loader constraint violations to include the module and class loader information.
Reviewed-by: coleenp, goetz, hseigel
*** 667,693 ****
ResourceMark rm(THREAD);
Symbol* failed_type_symbol =
SystemDictionary::check_signature_loaders(link_info.signature(), current_loader,
resolved_loader, true, CHECK);
if (failed_type_symbol != NULL) {
! const char* msg = "loader constraint violation: when resolving %s"
" \"%s\" the class loader %s of the current class, %s,"
" and the class loader %s for the method's defining class, %s, have"
! " different Class objects for the type %s used in the signature";
! char* sig = link_info.method_string();
! const char* loader1_name = java_lang_ClassLoader::describe_external(current_loader());
! char* current = link_info.current_klass()->name()->as_C_string();
! const char* loader2_name = java_lang_ClassLoader::describe_external(resolved_loader());
! char* target = resolved_method->method_holder()->name()->as_C_string();
! char* failed_type_name = failed_type_symbol->as_C_string();
! size_t buflen = strlen(msg) + strlen(sig) + strlen(loader1_name) +
! strlen(current) + strlen(loader2_name) + strlen(target) +
! strlen(failed_type_name) + strlen(method_type) + 1;
! char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
! jio_snprintf(buf, buflen, msg, method_type, sig, loader1_name, current, loader2_name,
! target, failed_type_name);
! THROW_MSG(vmSymbols::java_lang_LinkageError(), buf);
}
}
void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig,
Klass* current_klass,
--- 667,698 ----
ResourceMark rm(THREAD);
Symbol* failed_type_symbol =
SystemDictionary::check_signature_loaders(link_info.signature(), current_loader,
resolved_loader, true, CHECK);
if (failed_type_symbol != NULL) {
! Klass* current_class = link_info.current_klass();
! ClassLoaderData* current_loader_data = current_class->class_loader_data();
! assert(current_loader_data != NULL, "current class has no class loader data");
! Klass* resolved_method_class = resolved_method->method_holder();
! ClassLoaderData* target_loader_data = resolved_method_class->class_loader_data();
! assert(target_loader_data != NULL, "resolved method's class has no class loader data");
!
! stringStream ss;
! ss.print("loader constraint violation: when resolving %s"
" \"%s\" the class loader %s of the current class, %s,"
" and the class loader %s for the method's defining class, %s, have"
! " different Class objects for the type %s used in the signature (%s; %s)",
! method_type,
! link_info.method_string(),
! current_loader_data->loader_name_and_id(),
! current_class->name()->as_C_string(),
! target_loader_data->loader_name_and_id(),
! resolved_method_class->name()->as_C_string(),
! failed_type_symbol->as_C_string(),
! current_class->class_in_module_of_loader(false, true),
! resolved_method_class->class_in_module_of_loader(false, true));
! THROW_MSG(vmSymbols::java_lang_LinkageError(), ss.as_string());
}
}
void LinkResolver::check_field_loader_constraints(Symbol* field, Symbol* sig,
Klass* current_klass,
*** 700,726 ****
SystemDictionary::check_signature_loaders(sig,
ref_loader, sel_loader,
false,
CHECK);
if (failed_type_symbol != NULL) {
! const char* msg = "loader constraint violation: when resolving field"
" \"%s\" of type %s, the class loader %s of the current class, "
"%s, and the class loader %s for the field's defining "
! "type, %s, have different Class objects for type %s";
! const char* field_name = field->as_C_string();
! const char* loader1_name = java_lang_ClassLoader::describe_external(ref_loader());
! const char* sel = sel_klass->external_name();
! const char* loader2_name = java_lang_ClassLoader::describe_external(sel_loader());
! const char* failed_type_name = failed_type_symbol->as_klass_external_name();
! const char* curr_klass_name = current_klass->external_name();
! size_t buflen = strlen(msg) + strlen(field_name) + 2 * strlen(failed_type_name) +
! strlen(loader1_name) + strlen(curr_klass_name) +
! strlen(loader2_name) + strlen(sel) + 1;
! char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen);
! jio_snprintf(buf, buflen, msg, field_name, failed_type_name, loader1_name,
! curr_klass_name, loader2_name, sel, failed_type_name);
! THROW_MSG(vmSymbols::java_lang_LinkageError(), buf);
}
}
methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
Bytecodes::Code code, TRAPS) {
--- 705,731 ----
SystemDictionary::check_signature_loaders(sig,
ref_loader, sel_loader,
false,
CHECK);
if (failed_type_symbol != NULL) {
! stringStream ss;
! const char* failed_type_name = failed_type_symbol->as_klass_external_name();
!
! ss.print("loader constraint violation: when resolving field"
" \"%s\" of type %s, the class loader %s of the current class, "
"%s, and the class loader %s for the field's defining "
! "type, %s, have different Class objects for type %s (%s; %s)",
! field->as_C_string(),
! failed_type_name,
! current_klass->class_loader_data()->loader_name_and_id(),
! current_klass->external_name(),
! sel_klass->class_loader_data()->loader_name_and_id(),
! sel_klass->external_name(),
! failed_type_name,
! current_klass->class_in_module_of_loader(false, true),
! sel_klass->class_in_module_of_loader(false, true));
! THROW_MSG(vmSymbols::java_lang_LinkageError(), ss.as_string());
}
}
methodHandle LinkResolver::resolve_method(const LinkInfo& link_info,
Bytecodes::Code code, TRAPS) {
< prev index next >