--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	2015-02-23 20:10:50.000000000 +0100
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	2015-02-23 20:10:49.000000000 +0100
@@ -234,6 +234,8 @@
     }
 
     private boolean unique(TypeVar typevar) {
+        typevar = (TypeVar)typevar.underlyingTypeOrType();
+
         int found = 0;
         for (Type t : whereClauses.get(WhereClauseKind.TYPEVAR).keySet()) {
             if (t.toString().equals(typevar.toString())) {