stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8027304: Lambda: inheriting abstract + 1 default -> default, not ICCE

Browse Source 
Reviewed-by: hseigel, zgu
This commit is contained in:
Karen Kinnear 2013-10-30 09:11:04 -07:00
parent 3e0a2a86bf
commit ca92769602
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/share/vm/classfile/defaultMethods.cpp
View File

@ -392,10 +392,16 @@ class MethodFamily : public ResourceObj {
}
GrowableArray<Method*> qualified_methods;
int num_defaults = 0;
int default_index = -1;
for (int i = 0; i < _members.length(); ++i) {
Pair<Method*,QualifiedState> entry = _members.at(i);
if (entry.second == QUALIFIED) {
qualified_methods.append(entry.first);
default_index++;
if (entry.first->is_default_method()) {
num_defaults++;
}
}
}
@ -408,6 +414,9 @@ class MethodFamily : public ResourceObj {
if (!method->is_abstract()) {
_selected_target = qualified_methods.at(0);
}
// If only one qualified method is default, select that
} else if (num_defaults == 1) {
_selected_target = qualified_methods.at(default_index);
} else {
_exception_message = generate_conflicts_message(&qualified_methods,CHECK);
_exception_name = vmSymbols::java_lang_IncompatibleClassChangeError();