--- old/src/share/classes/com/sun/tools/javac/code/Types.java 2013-05-02 22:24:29.628050673 -0400 +++ new/src/share/classes/com/sun/tools/javac/code/Types.java 2013-05-02 22:24:29.471049205 -0400 @@ -1298,6 +1298,27 @@ } // + /** + * Can t and s be compared for equality? + * + */ + public boolean isEqualityComparable(Type t, Type s, Warner warn) { + if (t.tag == ERROR) + return true; + boolean tPrimitive = t.isPrimitive(); + boolean sPrimitive = s.isPrimitive(); + if (tPrimitive && sPrimitive) { + return isSubtypeUnchecked(t, s, warn); + } else if (!tPrimitive && !sPrimitive) + return isCastable(t, s, warn); + else if (allowBoxing) { + return tPrimitive + ? isSubtype(unboxedType(s), t) + : isSubtype(unboxedType(t), s); + } else + return false; + } + // public boolean isCastable(Type t, Type s) { return isCastable(t, s, noWarnings);