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

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Jul 23 16:06:11 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Jul 23 20:42:54 2013 -0400
     1.3 @@ -134,7 +134,7 @@
     1.4       * @return the upper bound of the given type
     1.5       */
     1.6      public Type upperBound(Type t) {
     1.7 -        return upperBound.visit(t);
     1.8 +        return upperBound.visit(t).unannotatedType();
     1.9      }
    1.10      // where
    1.11          private final MapVisitor<Void> upperBound = new MapVisitor<Void>() {
    1.12 @@ -1130,9 +1130,9 @@
    1.13  
    1.14                      HashSet<UniqueType> set = new HashSet<UniqueType>();
    1.15                      for (Type x : interfaces(t))
    1.16 -                        set.add(new UniqueType(x, Types.this));
    1.17 +                        set.add(new UniqueType(x.unannotatedType(), Types.this));
    1.18                      for (Type x : interfaces(s)) {
    1.19 -                        if (!set.remove(new UniqueType(x, Types.this)))
    1.20 +                        if (!set.remove(new UniqueType(x.unannotatedType(), Types.this)))
    1.21                              return false;
    1.22                      }
    1.23                      return (set.isEmpty());