Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Fri Oct 31 20:19:04 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Mon Nov 03 16:03:37 2014 -0800
     1.3 @@ -3624,7 +3624,8 @@
     1.4              for (Type erasedSupertype : mec) {
     1.5                  List<Type> lci = List.of(asSuper(ts[startIdx], erasedSupertype.tsym));
     1.6                  for (int i = startIdx + 1 ; i < ts.length ; i++) {
     1.7 -                    lci = intersect(lci, List.of(asSuper(ts[i], erasedSupertype.tsym)));
     1.8 +                    Type superType = asSuper(ts[i], erasedSupertype.tsym);
     1.9 +                    lci = intersect(lci, superType != null ? List.of(superType) : List.<Type>nil());
    1.10                  }
    1.11                  candidates = candidates.appendList(lci);
    1.12              }