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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Fri Oct 31 20:19:04 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Mon Nov 03 16:03:37 2014 -0800
     1.3 @@ -784,7 +784,10 @@
     1.4                      while (tmpTail.nonEmpty()) {
     1.5                          Type b1 = boundList.head;
     1.6                          Type b2 = tmpTail.head;
     1.7 -                        if (b1 != b2) {
     1.8 +                        /* This wildcard check is temporary workaround. This code may need to be
     1.9 +                         * revisited once spec bug JDK-7034922 is fixed.
    1.10 +                         */
    1.11 +                        if (b1 != b2 && !b1.hasTag(WILDCARD) && !b2.hasTag(WILDCARD)) {
    1.12                              Pair<Type, Type> commonSupers = infer.getParameterizedSupers(b1, b2);
    1.13                              if (commonSupers != null) {
    1.14                                  List<Type> allParamsSuperBound1 = commonSupers.fst.allparams();