infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-11 02:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

8037804: Implement specified test for related functional interface types

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Dan Smith 2016-06-10 16:43:38 -06:00
parent 5cffc0a3ab
commit 448079796f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
View File

@ -1149,8 +1149,28 @@ public class Resolve {
private boolean unrelatedFunctionalInterfaces(Type t, Type s) {
return types.isFunctionalInterface(t.tsym) &&
types.isFunctionalInterface(s.tsym) &&
types.asSuper(t, s.tsym) == null &&
types.asSuper(s, t.tsym) == null;
unrelatedInterfaces(t, s);
}
/** Whether {@code t} and {@code s} are unrelated interface types; recurs on intersections. **/
private boolean unrelatedInterfaces(Type t, Type s) {
if (t.isCompound()) {
for (Type ti : types.interfaces(t)) {
if (!unrelatedInterfaces(ti, s)) {
return false;
}
}
return true;
} else if (s.isCompound()) {
for (Type si : types.interfaces(s)) {
if (!unrelatedInterfaces(t, si)) {
return false;
}
}
return true;
} else {
return types.asSuper(t, s.tsym) == null && types.asSuper(s, t.tsym) == null;
}
}
/** Parameters {@code t} and {@code s} are unrelated functional interface types. */