src/share/classes/com/sun/tools/javac/code/Types.java

*** 132,142 ****
       * and lower bounds.
       * @param t a type
       * @return the upper bound of the given type
       */
      public Type upperBound(Type t) {
!         return upperBound.visit(t);
      }
      // where
          private final MapVisitor<Void> upperBound = new MapVisitor<Void>() {
  
              @Override
--- 132,142 ----
       * and lower bounds.
       * @param t a type
       * @return the upper bound of the given type
       */
      public Type upperBound(Type t) {
!         return upperBound.visit(t).unannotatedType();
      }
      // where
          private final MapVisitor<Void> upperBound = new MapVisitor<Void>() {
  
              @Override
*** 1128,1140 ****
                      if (!visit(supertype(t), supertype(s)))
                          return false;
  
                      HashSet<UniqueType> set = new HashSet<UniqueType>();
                      for (Type x : interfaces(t))
!                         set.add(new UniqueType(x, Types.this));
                      for (Type x : interfaces(s)) {
!                         if (!set.remove(new UniqueType(x, Types.this)))
                              return false;
                      }
                      return (set.isEmpty());
                  }
                  return t.tsym == s.tsym
--- 1128,1140 ----
                      if (!visit(supertype(t), supertype(s)))
                          return false;
  
                      HashSet<UniqueType> set = new HashSet<UniqueType>();
                      for (Type x : interfaces(t))
!                         set.add(new UniqueType(x.unannotatedType(), Types.this));
                      for (Type x : interfaces(s)) {
!                         if (!set.remove(new UniqueType(x.unannotatedType(), Types.this)))
                              return false;
                      }
                      return (set.isEmpty());
                  }
                  return t.tsym == s.tsym