archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-24 04:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Karen Kinnear 2013-09-16 15:24:11 -07:00
commit 9fb6519ce0
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/classfile/defaultMethods.cpp
View file

@ -450,6 +450,10 @@ class MethodFamily : public ResourceObj {
streamIndentor si(str, indent * 2); streamIndentor si(str, indent * 2);
str->indent().print("Selected method: "); str->indent().print("Selected method: ");
print_method(str, _selected_target); print_method(str, _selected_target);
Klass* method_holder = _selected_target->method_holder();
if (!method_holder->is_interface()) {
tty->print(" : in superclass");
}
str->print_cr(""); str->print_cr("");
} }
@ -1141,19 +1145,23 @@ static void create_overpasses(
#endif // ndef PRODUCT #endif // ndef PRODUCT
if (method->has_target()) { if (method->has_target()) {
Method* selected = method->get_selected_target(); Method* selected = method->get_selected_target();
max_stack = assemble_redirect( if (selected->method_holder()->is_interface()) {
max_stack = assemble_redirect(
&bpool, &buffer, slot->signature(), selected, CHECK); &bpool, &buffer, slot->signature(), selected, CHECK);
}
} else if (method->throws_exception()) { } else if (method->throws_exception()) {
max_stack = assemble_abstract_method_error( max_stack = assemble_abstract_method_error(
&bpool, &buffer, method->get_exception_message(), CHECK); &bpool, &buffer, method->get_exception_message(), CHECK);
} }
AccessFlags flags = accessFlags_from( if (max_stack != 0) {
AccessFlags flags = accessFlags_from(
JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE); JVM_ACC_PUBLIC | JVM_ACC_SYNTHETIC | JVM_ACC_BRIDGE);
Method* m = new_method(&bpool, &buffer, slot->name(), slot->signature(), Method* m = new_method(&bpool, &buffer, slot->name(), slot->signature(),
flags, max_stack, slot->size_of_parameters(), flags, max_stack, slot->size_of_parameters(),
ConstMethod::OVERPASS, CHECK); ConstMethod::OVERPASS, CHECK);
if (m != NULL) { if (m != NULL) {
overpasses.push(m); overpasses.push(m);
}
} }
} }
} }