1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java Fri Dec 10 07:38:28 2010 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Sun Dec 12 10:05:40 2010 -0800
1.3 @@ -641,7 +641,7 @@
1.4 if (!set.remove(new SingletonType(x)))
1.5 return false;
1.6 }
1.7 - return (set.size() == 0);
1.8 + return (set.isEmpty());
1.9 }
1.10 return t.tsym == s.tsym
1.11 && visit(t.getEnclosingType(), s.getEnclosingType())
1.12 @@ -838,26 +838,26 @@
1.13 return isSameType(t, s);
1.14 }
1.15
1.16 - void debugContainsType(WildcardType t, Type s) {
1.17 - System.err.println();
1.18 - System.err.format(" does %s contain %s?%n", t, s);
1.19 - System.err.format(" %s U(%s) <: U(%s) %s = %s%n",
1.20 - upperBound(s), s, t, U(t),
1.21 - t.isSuperBound()
1.22 - || isSubtypeNoCapture(upperBound(s), U(t)));
1.23 - System.err.format(" %s L(%s) <: L(%s) %s = %s%n",
1.24 - L(t), t, s, lowerBound(s),
1.25 - t.isExtendsBound()
1.26 - || isSubtypeNoCapture(L(t), lowerBound(s)));
1.27 - System.err.println();
1.28 - }
1.29 +// void debugContainsType(WildcardType t, Type s) {
1.30 +// System.err.println();
1.31 +// System.err.format(" does %s contain %s?%n", t, s);
1.32 +// System.err.format(" %s U(%s) <: U(%s) %s = %s%n",
1.33 +// upperBound(s), s, t, U(t),
1.34 +// t.isSuperBound()
1.35 +// || isSubtypeNoCapture(upperBound(s), U(t)));
1.36 +// System.err.format(" %s L(%s) <: L(%s) %s = %s%n",
1.37 +// L(t), t, s, lowerBound(s),
1.38 +// t.isExtendsBound()
1.39 +// || isSubtypeNoCapture(L(t), lowerBound(s)));
1.40 +// System.err.println();
1.41 +// }
1.42
1.43 @Override
1.44 public Boolean visitWildcardType(WildcardType t, Type s) {
1.45 if (s.tag >= firstPartialTag)
1.46 return containedBy(s, t);
1.47 else {
1.48 - // debugContainsType(t, s);
1.49 +// debugContainsType(t, s);
1.50 return isSameWildcard(t, s)
1.51 || isCaptureOf(s, t)
1.52 || ((t.isExtendsBound() || isSubtypeNoCapture(L(t), lowerBound(s))) &&
