jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/comp/Check.java

equal deleted inserted replaced

-:e1efbecefefa
+:9d4e765fe447
 */
 void checkOverrideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) {
 ClashFilter cf = new ClashFilter(site);
 //for each method m1 that is overridden (directly or indirectly)
 //by method 'sym' in 'site'...
+List<MethodSymbol> potentiallyAmbiguousList = List.nil();
+boolean overridesAny = false;
 for (Symbol m1 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
 if (!sym.overrides(m1, site.tsym, types, false)) {
-checkPotentiallyAmbiguousOverloads(pos, site, sym, (MethodSymbol)m1);
+if (m1 == sym) {
 continue;
 }
-//...check each method m2 that is a member of 'site'
-for (Symbol m2 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
+if (!overridesAny) {
+potentiallyAmbiguousList = potentiallyAmbiguousList.prepend((MethodSymbol)m1);
+}
+continue;
+}
+if (m1 != sym) {
+overridesAny = true;
+potentiallyAmbiguousList = List.nil();
+}
+//...check each method m2 that is a member of 'site'
+for (Symbol m2 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
 if (m2 == m1) continue;
 //if (i) the signature of 'sym' is not a subsignature of m1 (seen as
 //a member of 'site') and (ii) m1 has the same erasure as m2, issue an error
 if (!types.isSubSignature(sym.type, types.memberType(site, m2), allowStrictMethodClashCheck) &&
 types.hasSameArgs(m2.erasure(types), m1.erasure(types))) {
 m1, m1.location());
 return;
 }
 }
 }
-}
+if (!overridesAny) {
+for (MethodSymbol m: potentiallyAmbiguousList) {
+checkPotentiallyAmbiguousOverloads(pos, site, sym, m);
+}
+}
+}
 /** Check that all static methods accessible from 'site' are
 *  mutually compatible (JLS 8.4.8).
 *
 *  @param pos  Position to be used for error reporting.

changeset 21025	9d4e765fe447
parent 21018	95d225149128
child 21041	99f5e5e97425