Mercurial > hg > icedtea9-forest > langtools

changeset 1331:cddc2c894cc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7175911: Simplify error reporting API in Check.CheckContext interface Summary: Make error messages generated during Check.checkType more uniform and more scalable Reviewed-by: jjg, dlsmith
author mcimadamore
date Thu, 02 Aug 2012 18:22:41 +0100
parents b2d8a270f5f2
children e5cf1569d3a4
files src/share/classes/com/sun/tools/javac/comp/Attr.java src/share/classes/com/sun/tools/javac/comp/Check.java src/share/classes/com/sun/tools/javac/comp/Infer.java src/share/classes/com/sun/tools/javac/comp/Resolve.java src/share/classes/com/sun/tools/javac/resources/compiler.properties test/tools/javac/6840059/T6840059.out test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog test/tools/javac/7132880/T7132880.out test/tools/javac/Diagnostics/6722234/T6722234a_1.out test/tools/javac/Diagnostics/6722234/T6722234a_2.out test/tools/javac/Diagnostics/6722234/T6722234c.out test/tools/javac/Diagnostics/6722234/T6722234d_1.out test/tools/javac/Diagnostics/6722234/T6722234d_2.out test/tools/javac/Diagnostics/6799605/T6799605.out test/tools/javac/Diagnostics/6862608/T6862608a.out test/tools/javac/Diagnostics/6862608/T6862608b.out test/tools/javac/OverrideChecks/6400189/T6400189a.out test/tools/javac/OverrideChecks/6400189/T6400189b.out test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out test/tools/javac/T6326754.out test/tools/javac/TryWithResources/TwrOnNonResource.out test/tools/javac/cast/6270087/T6270087neg.out test/tools/javac/cast/6557182/T6557182.out test/tools/javac/cast/6665356/T6665356.out test/tools/javac/cast/6795580/T6795580.out test/tools/javac/cast/6932571/T6932571neg.out test/tools/javac/cast/7005095/T7005095neg.out test/tools/javac/cast/7005671/T7005671.out test/tools/javac/diags/examples/CantApplyDiamond1.java test/tools/javac/diags/examples/IncompatibleTypes1.java test/tools/javac/diags/examples/InconvertibleTypes.java test/tools/javac/diags/examples/InferNoConformingAssignment.java test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java test/tools/javac/diags/examples/InferredDoNotConformToLower.java test/tools/javac/diags/examples/KindnameConstructor.java test/tools/javac/diags/examples/NoUniqueMaximalInstance.java test/tools/javac/diags/examples/NotApplicableMethodFound.java test/tools/javac/diags/examples/PossibleLossPrecision.java test/tools/javac/diags/examples/ResourceNotApplicableToType.java test/tools/javac/diags/examples/VarargsArgumentMismatch.java test/tools/javac/diags/examples/VerboseResolveMulti1.java test/tools/javac/diags/examples/WhereFreshTvar.java test/tools/javac/diags/examples/WhereIntersection.java test/tools/javac/diags/examples/WhereTypeVar.java test/tools/javac/generics/6207386/T6207386.out test/tools/javac/generics/diamond/neg/Neg05.out test/tools/javac/generics/diamond/neg/Neg06.out test/tools/javac/generics/diamond/neg/Neg10.out test/tools/javac/generics/inference/6315770/T6315770.out test/tools/javac/generics/inference/6611449/T6611449.out test/tools/javac/generics/inference/6638712/T6638712a.out test/tools/javac/generics/inference/6638712/T6638712b.out test/tools/javac/generics/inference/6638712/T6638712c.out test/tools/javac/generics/inference/6638712/T6638712e.out test/tools/javac/generics/inference/6650759/T6650759m.out test/tools/javac/generics/inference/6838943/T6838943.out test/tools/javac/generics/inference/7086586/T7086586.out test/tools/javac/generics/inference/7154127/T7154127.out test/tools/javac/generics/rawOverride/7062745/T7062745neg.out test/tools/javac/generics/wildcards/6886247/T6886247_2.out test/tools/javac/multicatch/Neg06.out test/tools/javac/multicatch/Neg07.out test/tools/javac/types/CastObjectToPrimitiveTest.out test/tools/javac/varargs/6313164/T6313164.out test/tools/javac/varargs/7097436/T7097436.out
diffstat 71 files changed, 197 insertions(+), 215 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Aug 02 18:22:41 2012 +0100
@@ -1131,8 +1131,8 @@
         for (JCTree resource : tree.resources) {
             CheckContext twrContext = new Check.NestedCheckContext(resultInfo.checkContext) {
                 @Override
-                public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
-                    chk.basicHandler.report(pos, found, req, diags.fragment("try.not.applicable.to.type", found));
+                public void report(DiagnosticPosition pos, JCDiagnostic details) {
+                    chk.basicHandler.report(pos, diags.fragment("try.not.applicable.to.type", details));
                 }
             };
             ResultInfo twrResult = new ResultInfo(VAL, syms.autoCloseableType, twrContext);
@@ -1865,7 +1865,7 @@
 
     Type attribDiamond(Env<AttrContext> env,
                         final JCNewClass tree,
-                        Type clazztype,
+                        final Type clazztype,
                         List<Type> argtypes,
                         List<Type> typeargtypes) {
         if (clazztype.isErroneous() ||
@@ -1892,27 +1892,26 @@
                     argtypes,
                     typeargtypes);
 
+        Type owntype = types.createErrorType(clazztype);
         if (constructor.kind == MTH) {
-            try {
-                clazztype = rawCheckMethod(site,
-                        constructor,
-                        resultInfo,
-                        localEnv,
-                        tree.args,
-                        argtypes,
-                        typeargtypes,
-                        localEnv.info.varArgs).getReturnType();
-            } catch (Resolve.InapplicableMethodException ex) {
-                //an error occurred while inferring uninstantiated type-variables
-                resultInfo.checkContext.report(tree.clazz.pos(), clazztype, resultInfo.pt,
-                        diags.fragment("cant.apply.diamond.1", diags.fragment("diamond", clazztype.tsym), ex.diagnostic));
-                clazztype = syms.errType;
-            }
-        } else {
-            clazztype = syms.errType;
+            ResultInfo diamondResult = new ResultInfo(VAL, resultInfo.pt, new Check.NestedCheckContext(resultInfo.checkContext) {
+                @Override
+                public void report(DiagnosticPosition pos, JCDiagnostic details) {
+                    enclosingContext.report(tree.clazz.pos(),
+                            diags.fragment("cant.apply.diamond.1", diags.fragment("diamond", clazztype.tsym), details));
+                }
+            });
+            owntype = checkMethod(site,
+                    constructor,
+                    diamondResult,
+                    localEnv,
+                    tree.args,
+                    argtypes,
+                    typeargtypes,
+                    localEnv.info.varArgs).getReturnType();
         }
 
-        return chk.checkClassType(tree.clazz.pos(), clazztype, true);
+        return chk.checkClassType(tree.clazz.pos(), owntype, true);
     }
 
     /** Make an attributed null check tree.
@@ -2687,32 +2686,6 @@
                             List<Type> argtypes,
                             List<Type> typeargtypes,
                             boolean useVarargs) {
-        try {
-            return rawCheckMethod(site, sym, resultInfo, env, argtrees, argtypes, typeargtypes, useVarargs);
-        } catch (Resolve.InapplicableMethodException ex) {
-            String key = ex.getDiagnostic() == null ?
-                    "cant.apply.symbol" :
-                    "cant.apply.symbol.1";
-            log.error(env.tree.pos, key,
-                      Kinds.kindName(sym),
-                      sym.name == names.init ? sym.owner.name : sym.name,
-                      rs.methodArguments(sym.type.getParameterTypes()),
-                      rs.methodArguments(argtypes),
-                      Kinds.kindName(sym.owner),
-                      sym.owner.type,
-                      ex.getDiagnostic());
-            return types.createErrorType(site);
-        }
-    }
-
-    private Type rawCheckMethod(Type site,
-                            Symbol sym,
-                            ResultInfo resultInfo,
-                            Env<AttrContext> env,
-                            final List<JCExpression> argtrees,
-                            List<Type> argtypes,
-                            List<Type> typeargtypes,
-                            boolean useVarargs) {
         // Test (5): if symbol is an instance method of a raw type, issue
         // an unchecked warning if its argument types change under erasure.
         if (allowGenerics &&
@@ -2733,19 +2706,29 @@
         // Resolve.instantiate from the symbol's type as well as
         // any type arguments and value arguments.
         noteWarner.clear();
-        Type owntype = rs.rawInstantiate(env,
-                                          site,
-                                          sym,
-                                          resultInfo,
-                                          argtypes,
-                                          typeargtypes,
-                                          true,
-                                          useVarargs,
-                                          noteWarner);
-
-        boolean unchecked = noteWarner.hasNonSilentLint(LintCategory.UNCHECKED);
-
-        return chk.checkMethod(owntype, sym, env, argtrees, argtypes, useVarargs, unchecked);
+        try {
+            Type owntype = rs.rawInstantiate(
+                    env,
+                    site,
+                    sym,
+                    resultInfo,
+                    argtypes,
+                    typeargtypes,
+                    allowBoxing,
+                    useVarargs,
+                    noteWarner);
+
+            return chk.checkMethod(owntype, sym, env, argtrees, argtypes, useVarargs,
+                    noteWarner.hasNonSilentLint(LintCategory.UNCHECKED));
+        } catch (Infer.InferenceException ex) {
+            //invalid target type - propagate exception outwards or report error
+            //depending on the current check context
+            resultInfo.checkContext.report(env.tree.pos(), ex.getDiagnostic());
+            return types.createErrorType(site);
+        } catch (Resolve.InapplicableMethodException ex) {
+            Assert.error();
+            return null;
+        }
     }
 
     /**
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Aug 02 18:22:41 2012 +0100
@@ -426,7 +426,7 @@
         /**
          * Report a check error
          */
-        void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details);
+        void report(DiagnosticPosition pos, JCDiagnostic details);
         /**
          * Obtain a warner for this check context
          */
@@ -450,8 +450,8 @@
             return enclosingContext.compatible(found, req, warn);
         }
 
-        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
-            enclosingContext.report(pos, found, req, details);
+        public void report(DiagnosticPosition pos, JCDiagnostic details) {
+            enclosingContext.report(pos, details);
         }
 
         public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
@@ -463,12 +463,8 @@
      * Check context to be used when evaluating assignment/return statements
      */
     CheckContext basicHandler = new CheckContext() {
-        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
-            if (details == null) {
-                log.error(pos, "prob.found.req", found, req);
-            } else {
-                log.error(pos, "prob.found.req.1", details);
-            }
+        public void report(DiagnosticPosition pos, JCDiagnostic details) {
+            log.error(pos, "prob.found.req", details);
         }
         public boolean compatible(Type found, Type req, Warner warn) {
             return types.isAssignable(found, req, warn);
@@ -498,10 +494,10 @@
             return found;
         } else {
             if (found.tag <= DOUBLE && req.tag <= DOUBLE) {
-                checkContext.report(pos, found, req, diags.fragment("possible.loss.of.precision"));
+                checkContext.report(pos, diags.fragment("possible.loss.of.precision", found, req));
                 return types.createErrorType(found);
             }
-            checkContext.report(pos, found, req, null);
+            checkContext.report(pos, diags.fragment("inconvertible.types", found, req));
             return types.createErrorType(found);
         }
     }
@@ -519,7 +515,7 @@
         if (types.isCastable(found, req, castWarner(pos, found, req))) {
             return req;
         } else {
-            checkContext.report(pos, found, req, diags.fragment("inconvertible.types", found, req));
+            checkContext.report(pos, diags.fragment("inconvertible.types", found, req));
             return types.createErrorType(found);
         }
     }
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Aug 02 18:22:41 2012 +0100
@@ -382,14 +382,14 @@
             }
 
             public InapplicableMethodException arityMismatch() {
-                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch");
+                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch", inferenceVars(undetvars));
             }
-            public InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected) {
+            public InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details) {
                 String key = varargs ?
-                    "infer.varargs.argument.mismatch" :
-                    "infer.no.conforming.assignment.exists";
+                        "infer.varargs.argument.mismatch" :
+                        "infer.no.conforming.assignment.exists";
                 return unambiguousNoInstanceException.setMessage(key,
-                        inferenceVars(undetvars), found, expected);
+                        inferenceVars(undetvars), details);
             }
             public InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected) {
                 return unambiguousNoInstanceException.setMessage("inaccessible.varargs.type",
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Aug 02 18:22:41 2012 +0100
@@ -550,7 +550,7 @@
         /* The number of actuals and formals differ */
         InapplicableMethodException arityMismatch();
         /* An actual argument type does not conform to the corresponding formal type */
-        InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected);
+        InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details);
         /* The element type of a varargs is not accessible in the current context */
         InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected);
     }
@@ -565,12 +565,12 @@
             public InapplicableMethodException arityMismatch() {
                 return inapplicableMethodException.setMessage("arg.length.mismatch");
             }
-            public InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected) {
+            public InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details) {
                 String key = varargs ?
                         "varargs.argument.mismatch" :
                         "no.conforming.assignment.exists";
                 return inapplicableMethodException.setMessage(key,
-                        found, expected);
+                        details);
             }
             public InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected) {
                 return inapplicableMethodException.setMessage("inaccessible.varargs.type",
@@ -667,12 +667,8 @@
             this.rsWarner = rsWarner;
         }
 
-        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
-            throw handler.argumentMismatch(useVarargs, found, req);
-        }
-
-        public Type rawInstantiatePoly(ForAll found, Type req, Warner warn) {
-            throw new AssertionError("ForAll in argument position");
+        public void report(DiagnosticPosition pos, JCDiagnostic details) {
+            throw handler.argumentMismatch(useVarargs, details);
         }
 
         public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jul 26 16:48:41 2012 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Aug 02 18:22:41 2012 +0100
@@ -1497,14 +1497,8 @@
 
 #####
 
-# 0: type, 1: type
+# 0: message segment
 compiler.err.prob.found.req=\
-    incompatible types\n\
-    required: {1}\n\
-    found: {0}
-
-# 0: message segment
-compiler.err.prob.found.req.1=\
     incompatible types: {0}
 
 # 0: message segment, 1: type, 2: type
@@ -1517,8 +1511,9 @@
 compiler.misc.inconvertible.types=\
     {0} cannot be converted to {1}
 
+# 0: type, 1: type
 compiler.misc.possible.loss.of.precision=\
-    possible loss of precision
+    possible lossy conversion from {0} to {1}
 
 compiler.misc.unchecked.assign=\
     unchecked conversion
@@ -1537,8 +1532,8 @@
 
 # 0: type
 compiler.misc.try.not.applicable.to.type=\
-    try-with-resources not applicable to variable type {0}\n\
-    (expected a variable of type java.lang.AutoCloseable)
+    try-with-resources not applicable to variable type\n\
+    ({0})
 
 #####
 
@@ -1589,16 +1584,20 @@
 compiler.misc.infer.no.conforming.instance.exists=\
     no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
 
-# 0: list of type, 1: type, 2: type
+# 0: list of type, 1: message segment
 compiler.misc.infer.no.conforming.assignment.exists=\
-    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
-
+    cannot infer type-variable(s) {0}\n\
+    (argument mismatch; {1})
+
+# 0: list of type
 compiler.misc.infer.arg.length.mismatch=\
-    cannot instantiate from arguments because actual and formal argument lists differ in length
-
-# 0: list of type, 1: type, 2: type
+    cannot infer type-variable(s) {0}\n\
+    (actual and formal argument lists differ in length)
+
+# 0: list of type, 1: message segment
 compiler.misc.infer.varargs.argument.mismatch=\
-    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to vararg element type {2}
+    cannot infer type-variable(s) {0}\n\
+    (varargs mismatch; {1})
 
 # 0: type, 1: list of type
 compiler.misc.inferred.do.not.conform.to.upper.bounds=\
@@ -1637,13 +1636,13 @@
 compiler.misc.arg.length.mismatch=\
     actual and formal argument lists differ in length
 
-# 0: type, 1: type
+# 0: message segment
 compiler.misc.no.conforming.assignment.exists=\
-    actual argument {0} cannot be converted to {1} by method invocation conversion
-
-# 0: type, 1: type
+    argument mismatch; {0}
+
+# 0: message segment
 compiler.misc.varargs.argument.mismatch=\
-    argument type {0} does not conform to vararg element type {1}
+    varargs mismatch; {0}
 
 #####
 
--- a/test/tools/javac/6840059/T6840059.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6840059/T6840059.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6840059.java:15:9: compiler.err.cant.apply.symbol.1: kindname.constructor, T6840059, java.lang.Integer, java.lang.String, kindname.class, T6840059, (compiler.misc.no.conforming.assignment.exists: java.lang.String, java.lang.Integer)
+T6840059.java:15:9: compiler.err.cant.apply.symbol.1: kindname.constructor, T6840059, java.lang.Integer, java.lang.String, kindname.class, T6840059, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer))
 T6840059.java:15:25: compiler.err.cant.apply.symbol.1: kindname.constructor, T6840059, java.lang.Integer, compiler.misc.no.args, kindname.class, T6840059, (compiler.misc.arg.length.mismatch)
 2 errors
--- a/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD34.java:34:49: compiler.err.prob.found.req: java.lang.Number, boolean
+TestCast6979683_BAD34.java:34:49: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, boolean)
 1 error
--- a/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD35.java:35:45: compiler.err.prob.found.req: java.lang.Number, int
+TestCast6979683_BAD35.java:35:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, int)
 1 error
--- a/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD36.java:36:58: compiler.err.prob.found.req: java.lang.Comparable<java.lang.Integer>, int
+TestCast6979683_BAD36.java:36:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Integer>, int)
 1 error
--- a/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD37.java:37:61: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Short>, int)
+TestCast6979683_BAD37.java:37:61: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Short>, int)
 1 error
--- a/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD38.java:38:62: compiler.err.prob.found.req: java.lang.Comparable<java.lang.Character>, float
+TestCast6979683_BAD38.java:38:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Character>, float)
 1 error
--- a/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-TestCast6979683_BAD39.java:39:53: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Number, char)
+TestCast6979683_BAD39.java:39:53: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, char)
 1 error
--- a/test/tools/javac/7132880/T7132880.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/7132880/T7132880.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
-T7132880.java:23:12: compiler.err.cant.apply.symbol.1: kindname.method, m1, java.lang.Integer, java.lang.String, kindname.class, Outer.Inner1, (compiler.misc.no.conforming.assignment.exists: java.lang.String, java.lang.Integer)
-T7132880.java:33:12: compiler.err.cant.apply.symbols: kindname.method, m1, java.lang.String,{(compiler.misc.inapplicable.method: kindname.method, Outer.Inner2, m1(java.lang.Double), (compiler.misc.no.conforming.assignment.exists: java.lang.String, java.lang.Double)),(compiler.misc.inapplicable.method: kindname.method, Outer.Inner2, m1(java.lang.Integer), (compiler.misc.no.conforming.assignment.exists: java.lang.String, java.lang.Integer))}
+T7132880.java:23:12: compiler.err.cant.apply.symbol.1: kindname.method, m1, java.lang.Integer, java.lang.String, kindname.class, Outer.Inner1, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer))
+T7132880.java:33:12: compiler.err.cant.apply.symbols: kindname.method, m1, java.lang.String,{(compiler.misc.inapplicable.method: kindname.method, Outer.Inner2, m1(java.lang.Double), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Double))),(compiler.misc.inapplicable.method: kindname.method, Outer.Inner2, m1(java.lang.Integer), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)))}
 T7132880.java:43:12: compiler.err.ref.ambiguous: m2, kindname.method, m2(java.lang.Object,int), Outer.Inner3, kindname.method, m2(int,java.lang.Object), Outer.Inner3
 3 errors
--- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6722234a.java:12:9: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, (compiler.misc.no.conforming.assignment.exists: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1)
+T6722234a.java:12:9: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1))
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6722234a.java:12:9: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, (compiler.misc.no.conforming.assignment.exists: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1)
+T6722234a.java:12:9: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1))
 - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T6722234a),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, java.lang.Integer, kindname.method, <compiler.misc.type.var: T, 2>test(compiler.misc.type.var: T, 2))}
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6722234c.java:14:9: compiler.err.cant.apply.symbol.1: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, (compiler.misc.infer.no.conforming.assignment.exists: T, java.lang.String, T6722234c.String)
+T6722234c.java:14:9: compiler.err.cant.apply.symbol.1: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.lang.String, T6722234c.String))
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6722234d.java:18:20: compiler.err.prob.found.req: compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
 1 error
--- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6722234d.java:18:20: compiler.err.prob.found.req: compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
 1 error
--- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
-T6799605.java:17:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.inferred.do.not.conform.to.upper.bounds: compiler.misc.type.captureof: 1, ?, T6799605<compiler.misc.type.captureof: 1, ?>))}
-T6799605.java:18:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 2, ?, compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch))}
-T6799605.java:19:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 3, ?, compiler.misc.type.captureof: 3, ?,compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch))}
+T6799605.java:17:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.inferred.do.not.conform.to.upper.bounds: compiler.misc.type.captureof: 1, ?, T6799605<compiler.misc.type.captureof: 1, ?>))}
+T6799605.java:18:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 2, ?, compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T))}
+T6799605.java:19:9: compiler.err.cant.apply.symbols: kindname.method, m, T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>,{(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>,T6799605<T>), (compiler.misc.inferred.do.not.conform.to.eq.bounds: compiler.misc.type.captureof: 3, ?, compiler.misc.type.captureof: 3, ?,compiler.misc.type.captureof: 2, ?,compiler.misc.type.captureof: 1, ?)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>,T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.method, T6799605, <T>m(T6799605<T>), (compiler.misc.infer.arg.length.mismatch: T))}
 3 errors
--- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6862608a.java:19:33: compiler.err.cant.apply.symbol.1: kindname.method, compound, java.lang.Iterable<? extends java.util.Comparator<? super T>>, java.util.List<java.util.Comparator<?>>, kindname.class, T6862608a, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super T>>)
+T6862608a.java:19:33: compiler.err.cant.apply.symbol.1: kindname.method, compound, java.lang.Iterable<? extends java.util.Comparator<? super T>>, java.util.List<java.util.Comparator<?>>, kindname.class, T6862608a, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super T>>))
 - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
 1 error
--- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6862608b.java:11:7: compiler.err.cant.apply.symbol.1: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, (compiler.misc.no.conforming.assignment.exists: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1)
+T6862608b.java:11:7: compiler.err.cant.apply.symbol.1: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: compiler.misc.type.var: T, 2, compiler.misc.type.var: T, 1))
 - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,compiler.misc.type.var: S, 1,compiler.misc.type.var: S, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T66862608b),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, compiler.misc.type.var: S, 1, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 1, java.lang.Object, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 2, java.lang.Object, kindname.class, T66862608b)}
 1 error
--- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
 T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
-T6400189a.java:14:35: compiler.err.prob.found.req: java.lang.annotation.Annotation, java.lang.annotation.Documented
+T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.annotation.Annotation, java.lang.annotation.Documented)
 1 error
 1 warning
--- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
 T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
-T6400189b.java:24:24: compiler.err.prob.found.req: java.lang.Object, java.lang.Integer
+T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.Integer)
 1 error
 1 warning
--- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: int, java.lang.String
+BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
 1 error
--- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: java.math.RoundingMode, java.lang.String
+BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.math.RoundingMode, java.lang.String)
 1 error
--- a/test/tools/javac/T6326754.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/T6326754.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,6 +1,6 @@
 T6326754.java:44:12: compiler.err.name.clash.same.erasure: TestConstructor(T), TestConstructor(K)
 T6326754.java:52:17: compiler.err.name.clash.same.erasure: setT(K), setT(T)
-T6326754.java:64:18: compiler.err.prob.found.req: T, T
+T6326754.java:64:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, T)
 T6326754.java:70:11: compiler.err.cant.apply.symbol.1: kindname.method, setT, java.lang.Object, compiler.misc.no.args, kindname.class, TestC<T>, (compiler.misc.arg.length.mismatch)
 - compiler.note.unchecked.filename: T6326754.java
 - compiler.note.unchecked.recompile
--- a/test/tools/javac/TryWithResources/TwrOnNonResource.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/TryWithResources/TwrOnNonResource.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
-TwrOnNonResource.java:12:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
-TwrOnNonResource.java:15:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
-TwrOnNonResource.java:18:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
+TwrOnNonResource.java:12:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
+TwrOnNonResource.java:15:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
+TwrOnNonResource.java:18:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
 3 errors
--- a/test/tools/javac/cast/6270087/T6270087neg.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/6270087/T6270087neg.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6270087neg.java:36:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6270087neg.Foo<V>, T6270087neg.Foo<U>)
+T6270087neg.java:36:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6270087neg.Foo<V>, T6270087neg.Foo<U>)
 1 error
--- a/test/tools/javac/cast/6557182/T6557182.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,4 +1,4 @@
-T6557182.java:12:56: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T, java.lang.Comparable<java.lang.Integer>)
+T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, java.lang.Comparable<java.lang.Integer>)
 T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
 1 error
 1 warning
--- a/test/tools/javac/cast/6665356/T6665356.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,8 +1,8 @@
-T6665356.java:31:55: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>)
-T6665356.java:35:58: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>)
-T6665356.java:39:65: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>)
-T6665356.java:43:57: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>)
-T6665356.java:47:60: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>)
-T6665356.java:51:55: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>)
-T6665356.java:55:58: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>)
+T6665356.java:31:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>)
+T6665356.java:35:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>)
+T6665356.java:39:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>)
+T6665356.java:43:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>)
+T6665356.java:47:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>)
+T6665356.java:51:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>)
+T6665356.java:55:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>)
 7 errors
--- a/test/tools/javac/cast/6795580/T6795580.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,8 +1,8 @@
-T6795580.java:31:57: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[])
-T6795580.java:35:60: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[])
-T6795580.java:39:67: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[])
-T6795580.java:43:59: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[])
-T6795580.java:47:62: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[])
-T6795580.java:51:57: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[])
-T6795580.java:55:60: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[])
+T6795580.java:31:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[])
+T6795580.java:35:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[])
+T6795580.java:39:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[])
+T6795580.java:43:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[])
+T6795580.java:47:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[])
+T6795580.java:51:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[])
+T6795580.java:55:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[])
 7 errors
--- a/test/tools/javac/cast/6932571/T6932571neg.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/6932571/T6932571neg.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6932571neg.java:39:19: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6932571neg.S, G)
+T6932571neg.java:39:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6932571neg.S, G)
 1 error
--- a/test/tools/javac/cast/7005095/T7005095neg.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/7005095/T7005095neg.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T7005095neg.java:13:25: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T7005095pos.FooImpl, T7005095pos.Foo<T>)
+T7005095neg.java:13:25: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T7005095pos.FooImpl, T7005095pos.Foo<T>)
 1 error
--- a/test/tools/javac/cast/7005671/T7005671.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/cast/7005671/T7005671.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,17 +1,17 @@
-T7005671.java:12:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: byte[], X[])
-T7005671.java:13:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: short[], X[])
-T7005671.java:14:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: int[], X[])
-T7005671.java:15:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: long[], X[])
-T7005671.java:16:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: float[], X[])
-T7005671.java:17:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: double[], X[])
-T7005671.java:18:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: char[], X[])
-T7005671.java:19:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: boolean[], X[])
-T7005671.java:23:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], byte[])
-T7005671.java:24:30: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], short[])
-T7005671.java:25:28: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], int[])
-T7005671.java:26:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], long[])
-T7005671.java:27:30: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], float[])
-T7005671.java:28:31: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], double[])
-T7005671.java:29:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], char[])
-T7005671.java:30:32: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], boolean[])
+T7005671.java:12:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: byte[], X[])
+T7005671.java:13:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: short[], X[])
+T7005671.java:14:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int[], X[])
+T7005671.java:15:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: long[], X[])
+T7005671.java:16:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: float[], X[])
+T7005671.java:17:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: double[], X[])
+T7005671.java:18:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: char[], X[])
+T7005671.java:19:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: boolean[], X[])
+T7005671.java:23:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], byte[])
+T7005671.java:24:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], short[])
+T7005671.java:25:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], int[])
+T7005671.java:26:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], long[])
+T7005671.java:27:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], float[])
+T7005671.java:28:31: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], double[])
+T7005671.java:29:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], char[])
+T7005671.java:30:32: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], boolean[])
 16 errors
--- a/test/tools/javac/diags/examples/CantApplyDiamond1.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/CantApplyDiamond1.java	Thu Aug 02 18:22:41 2012 +0100
@@ -21,7 +21,7 @@
  * questions.
  */
 
-// key: compiler.err.prob.found.req.1
+// key: compiler.err.prob.found.req
 // key: compiler.misc.cant.apply.diamond.1
 // key: compiler.misc.inferred.do.not.conform.to.upper.bounds
 // key: compiler.misc.diamond
--- a/test/tools/javac/diags/examples/IncompatibleTypes1.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/IncompatibleTypes1.java	Thu Aug 02 18:22:41 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.misc.infer.no.conforming.instance.exists
-// key: compiler.err.cant.apply.symbol.1
+// key: compiler.err.prob.found.req
 
 class IncompatibleTypes1<V> {
     <T> IncompatibleTypes1<Integer> m() {
--- a/test/tools/javac/diags/examples/InconvertibleTypes.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/InconvertibleTypes.java	Thu Aug 02 18:22:41 2012 +0100
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.misc.inconvertible.types
-// key: compiler.err.prob.found.req.1
+// key: compiler.err.prob.found.req
 
 class InconvertibleTypes {
     class Outer<S> {
--- a/test/tools/javac/diags/examples/InferNoConformingAssignment.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/InferNoConformingAssignment.java	Thu Aug 02 18:22:41 2012 +0100
@@ -22,6 +22,7 @@
  */
 
 // key: compiler.err.cant.apply.symbol.1
+// key: compiler.misc.inconvertible.types
 // key: compiler.misc.infer.no.conforming.assignment.exists
 
 import java.util.*;
--- a/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java	Thu Aug 02 18:22:41 2012 +0100
@@ -23,6 +23,7 @@
 
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.infer.varargs.argument.mismatch
+// key: compiler.misc.inconvertible.types
 
 class InferVarargsArgumentMismatch {
     <X> void m(X x1, String... xs) {}
--- a/test/tools/javac/diags/examples/InferredDoNotConformToLower.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/InferredDoNotConformToLower.java	Thu Aug 02 18:22:41 2012 +0100
@@ -21,7 +21,7 @@
  * questions.
  */
 
-// key: compiler.err.cant.apply.symbol.1
+// key: compiler.err.prob.found.req
 // key: compiler.misc.inferred.do.not.conform.to.lower.bounds
 
 import java.util.*;
--- a/test/tools/javac/diags/examples/KindnameConstructor.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/KindnameConstructor.java	Thu Aug 02 18:22:41 2012 +0100
@@ -27,6 +27,7 @@
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.arg.length.mismatch
 // key: compiler.misc.no.conforming.assignment.exists
+// key: compiler.misc.inconvertible.types
 // key: compiler.misc.count.error.plural
 // key: compiler.err.error
 // run: backdoor
--- a/test/tools/javac/diags/examples/NoUniqueMaximalInstance.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/NoUniqueMaximalInstance.java	Thu Aug 02 18:22:41 2012 +0100
@@ -21,7 +21,7 @@
  * questions.
  */
 
-// key: compiler.err.cant.apply.symbol.1
+// key: compiler.err.prob.found.req
 // key: compiler.misc.no.unique.maximal.instance.exists
 
 class NoUniqueMaximalInstance {
--- a/test/tools/javac/diags/examples/NotApplicableMethodFound.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/NotApplicableMethodFound.java	Thu Aug 02 18:22:41 2012 +0100
@@ -25,6 +25,7 @@
 // key: compiler.note.verbose.resolve.multi.1
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.no.conforming.assignment.exists
+// key: compiler.misc.inconvertible.types
 // options: -XDverboseResolution=inapplicable,failure
 
 class NotApplicableMethodFound {
--- a/test/tools/javac/diags/examples/PossibleLossPrecision.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/PossibleLossPrecision.java	Thu Aug 02 18:22:41 2012 +0100
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.misc.possible.loss.of.precision
-// key: compiler.err.prob.found.req.1
+// key: compiler.err.prob.found.req
 
 class PossibleLossPrecision {
     long l;
--- a/test/tools/javac/diags/examples/ResourceNotApplicableToType.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/ResourceNotApplicableToType.java	Thu Aug 02 18:22:41 2012 +0100
@@ -22,7 +22,8 @@
  */
 
 // key: compiler.misc.try.not.applicable.to.type
-// key: compiler.err.prob.found.req.1
+// key: compiler.err.prob.found.req
+// key: compiler.misc.inconvertible.types
 
 class ResourceNotApplicableToType {
     void m() {
--- a/test/tools/javac/diags/examples/VarargsArgumentMismatch.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/VarargsArgumentMismatch.java	Thu Aug 02 18:22:41 2012 +0100
@@ -23,6 +23,7 @@
 
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.varargs.argument.mismatch
+// key: compiler.misc.inconvertible.types
 
 class VarargsArgumentMismatch {
     void m(String s, Integer... is) {}
--- a/test/tools/javac/diags/examples/VerboseResolveMulti1.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/VerboseResolveMulti1.java	Thu Aug 02 18:22:41 2012 +0100
@@ -25,6 +25,7 @@
 // key: compiler.note.verbose.resolve.multi.1
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.no.conforming.assignment.exists
+// key: compiler.misc.inconvertible.types
 // options: -XDverboseResolution=inapplicable,failure
 
 class VerboseResolveMulti1 {
--- a/test/tools/javac/diags/examples/WhereFreshTvar.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/WhereFreshTvar.java	Thu Aug 02 18:22:41 2012 +0100
@@ -23,8 +23,7 @@
 
 // key: compiler.misc.where.fresh.typevar
 // key: compiler.misc.where.description.typevar
-// key: compiler.err.cant.apply.symbol.1
-// key: compiler.misc.no.args
+// key: compiler.err.prob.found.req
 // key: compiler.misc.inferred.do.not.conform.to.upper.bounds
 // options: -XDdiags=where,simpleNames
 // run: simple
--- a/test/tools/javac/diags/examples/WhereIntersection.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/WhereIntersection.java	Thu Aug 02 18:22:41 2012 +0100
@@ -25,6 +25,7 @@
 // key: compiler.misc.where.description.intersection
 // key: compiler.misc.intersection.type
 // key: compiler.err.prob.found.req
+// key: compiler.misc.inconvertible.types
 // options: -XDdiags=where
 // run: simple
 
--- a/test/tools/javac/diags/examples/WhereTypeVar.java	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/diags/examples/WhereTypeVar.java	Thu Aug 02 18:22:41 2012 +0100
@@ -26,6 +26,7 @@
 // key: compiler.misc.type.var
 // key: compiler.err.cant.apply.symbol.1
 // key: compiler.misc.no.conforming.assignment.exists
+// key: compiler.misc.inconvertible.types
 // options: -XDdiags=where,disambiguateTvars
 // run: simple
 
--- a/test/tools/javac/generics/6207386/T6207386.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/6207386/T6207386.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6207386.java:13:30: compiler.err.prob.found.req: X, T6207386.F<? super X>
+T6207386.java:13:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X, T6207386.F<? super X>)
 1 error
--- a/test/tools/javac/generics/diamond/neg/Neg05.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/diamond/neg/Neg05.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,19 +1,19 @@
 Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:19:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
+Neg05.java:19:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
 Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:20:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
+Neg05.java:20:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
 Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:21:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
+Neg05.java:21:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
 Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:22:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
+Neg05.java:22:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
 Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:24:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
+Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
 Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:25:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
+Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
 Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:26:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
+Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
 Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
-Neg05.java:27:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
+Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
 Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param
 Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param
 Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param
--- a/test/tools/javac/generics/diamond/neg/Neg06.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/diamond/neg/Neg06.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-Neg06.java:16:37: compiler.err.prob.found.req.1: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Number))
+Neg06.java:16:37: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg06.CFoo), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Number))
 1 error
--- a/test/tools/javac/generics/diamond/neg/Neg10.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/diamond/neg/Neg10.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-Neg10.java:16:22: compiler.err.prob.found.req: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>
+Neg10.java:16:22: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>)
 1 error
--- a/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-T6315770.java:16:42: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.no.args, compiler.misc.no.args, kindname.class, T6315770<V>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
-T6315770.java:17:40: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.no.args, compiler.misc.no.args, kindname.class, T6315770<V>, (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer&java.lang.Runnable, java.lang.String)
+T6315770.java:16:42: compiler.err.prob.found.req: (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer&java.lang.Runnable, java.lang.String)
 2 errors
--- a/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,5 +1,5 @@
-T6611449.java:18:9: compiler.err.cant.apply.symbols: kindname.constructor, T6611449, int,{(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T,T), (compiler.misc.infer.arg.length.mismatch)),(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S))}
-T6611449.java:19:9: compiler.err.cant.apply.symbols: kindname.constructor, T6611449, int,int,{(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T,T), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S)),(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T), (compiler.misc.infer.arg.length.mismatch))}
+T6611449.java:18:9: compiler.err.cant.apply.symbols: kindname.constructor, T6611449, int,{(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T,T), (compiler.misc.infer.arg.length.mismatch: T)),(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S))}
+T6611449.java:19:9: compiler.err.cant.apply.symbols: kindname.constructor, T6611449, int,int,{(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T,T), (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S)),(compiler.misc.inapplicable.method: kindname.constructor, T6611449, <T>T6611449(T), (compiler.misc.infer.arg.length.mismatch: T))}
 T6611449.java:20:9: compiler.err.cant.apply.symbol.1: kindname.method, m1, T, int, kindname.class, T6611449<S>, (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S)
 T6611449.java:21:9: compiler.err.cant.apply.symbol.1: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, S)
 4 errors
--- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6638712a.java:16:33: compiler.err.cant.apply.symbol.1: kindname.method, compound, java.lang.Iterable<? extends java.util.Comparator<? super T>>, java.util.List<java.util.Comparator<?>>, kindname.class, T6638712a, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super T>>)
+T6638712a.java:16:33: compiler.err.cant.apply.symbol.1: kindname.method, compound, java.lang.Iterable<? extends java.util.Comparator<? super T>>, java.util.List<java.util.Comparator<?>>, kindname.class, T6638712a, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super T>>))
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6638712b.java:14:21: compiler.err.cant.apply.symbol.1: kindname.method, m, I, T6638712b<java.lang.Integer>, kindname.class, T6638712b<X>, (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String,java.lang.Object)
+T6638712b.java:14:21: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String,java.lang.Object)
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6638712c.java:16:9: compiler.err.cant.apply.symbol.1: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, (compiler.misc.no.conforming.assignment.exists: java.util.Comparator<java.lang.Enum<?>>, java.util.Comparator<? super java.lang.Enum>)
+T6638712c.java:16:9: compiler.err.cant.apply.symbol.1: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inconvertible.types: java.util.Comparator<java.lang.Enum<?>>, java.util.Comparator<? super java.lang.Enum>))
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6638712e.java:17:27: compiler.err.cant.apply.symbol.1: kindname.method, m, T6638712e.Foo<? super X,? extends A>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>, kindname.class, T6638712e.Foo<A,B>, (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Object, java.lang.Boolean,java.lang.Object)
+T6638712e.java:17:27: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Object, java.lang.Boolean,java.lang.Object)
 1 error
--- a/test/tools/javac/generics/inference/6650759/T6650759m.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6650759/T6650759m.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6650759m.java:43:36: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? extends java.util.List<? super Z>>, java.util.ArrayList<java.util.ArrayList<java.lang.Integer>>, kindname.class, T6650759m, (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String)
+T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String)
 1 error
--- a/test/tools/javac/generics/inference/6838943/T6838943.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/6838943/T6838943.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6838943.java:13:14: compiler.err.cant.apply.symbol.1: kindname.method, m, T6838943.A<Z>,Z, T6838943.A<T6838943.B>,T6838943.B, kindname.class, T6838943.C<X>, (compiler.misc.infer.no.conforming.assignment.exists: Z, T6838943.A<T6838943.B>, T6838943.A<Z>)
+T6838943.java:13:14: compiler.err.cant.apply.symbol.1: kindname.method, m, T6838943.A<Z>,Z, T6838943.A<T6838943.B>,T6838943.B, kindname.class, T6838943.C<X>, (compiler.misc.infer.no.conforming.assignment.exists: Z, (compiler.misc.inconvertible.types: T6838943.A<T6838943.B>, T6838943.A<Z>))
 1 error
--- a/test/tools/javac/generics/inference/7086586/T7086586.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/7086586/T7086586.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,5 +1,5 @@
-T7086586.java:14:20: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>)
-T7086586.java:15:20: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>)
-T7086586.java:16:23: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>)
-T7086586.java:17:9: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>)
+T7086586.java:14:20: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>))
+T7086586.java:15:20: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>))
+T7086586.java:16:23: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>))
+T7086586.java:17:9: compiler.err.cant.apply.symbol.1: kindname.method, m, java.util.List<? super T>, java.util.List<compiler.misc.type.captureof: 1, ?>, kindname.class, T7086586, (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.inconvertible.types: java.util.List<compiler.misc.type.captureof: 1, ?>, java.util.List<? super T>))
 4 errors
--- a/test/tools/javac/generics/inference/7154127/T7154127.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/inference/7154127/T7154127.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T7154127.java:19:49: compiler.err.cant.apply.symbol.1: kindname.method, m, compiler.misc.no.args, compiler.misc.no.args, kindname.class, T7154127, (compiler.misc.inferred.do.not.conform.to.upper.bounds: Y, T7154127.D,T7154127.B<U>)
+T7154127.java:19:49: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: Y, T7154127.D,T7154127.B<U>)
 1 error
--- a/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T7062745neg.java:16:36: compiler.err.prob.found.req: java.lang.Object, java.lang.Number
+T7062745neg.java:16:36: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.Number)
 1 error
--- a/test/tools/javac/generics/wildcards/6886247/T6886247_2.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/generics/wildcards/6886247/T6886247_2.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-T6886247_2.java:35:28: compiler.err.prob.found.req: compiler.misc.type.captureof: 1, ?, E
+T6886247_2.java:35:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.type.captureof: 1, ?, E)
 1 error
--- a/test/tools/javac/multicatch/Neg06.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/multicatch/Neg06.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,3 +1,3 @@
-Neg06.java:14:16: compiler.err.prob.found.req: java.lang.String, java.lang.Throwable
-Neg06.java:14:25: compiler.err.prob.found.req: java.lang.Integer, java.lang.Throwable
+Neg06.java:14:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Throwable)
+Neg06.java:14:25: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Integer, java.lang.Throwable)
 2 errors
--- a/test/tools/javac/multicatch/Neg07.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/multicatch/Neg07.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-Neg07.java:14:56: compiler.err.prob.found.req: java.lang.Class<compiler.misc.type.captureof: 1, ? extends Neg07.ParentException>, java.lang.Class<? extends Neg07.HasFoo>
+Neg07.java:14:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Class<compiler.misc.type.captureof: 1, ? extends Neg07.ParentException>, java.lang.Class<? extends Neg07.HasFoo>)
 1 error
--- a/test/tools/javac/types/CastObjectToPrimitiveTest.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/types/CastObjectToPrimitiveTest.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,2 +1,2 @@
-CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Object, int)
+CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, int)
 1 error
--- a/test/tools/javac/varargs/6313164/T6313164.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/varargs/6313164/T6313164.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,6 +1,6 @@
 T6313164.java:12:8: compiler.err.cant.apply.symbol.1: kindname.method, foo1, p1.A[], p1.B,p1.B, kindname.class, p1.B, (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
-T6313164.java:14:13: compiler.err.cant.apply.symbol.1: kindname.method, foo3, X[], compiler.misc.type.null,compiler.misc.type.null, kindname.class, p1.B, (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
-T6313164.java:15:13: compiler.err.cant.apply.symbol.1: kindname.method, foo4, X[], compiler.misc.type.null,compiler.misc.type.null, kindname.class, p1.B, (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
+T6313164.java:14:13: compiler.err.prob.found.req: (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
+T6313164.java:15:13: compiler.err.prob.found.req: (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
 - compiler.note.unchecked.filename: B.java
 - compiler.note.unchecked.recompile
 3 errors
--- a/test/tools/javac/varargs/7097436/T7097436.out	Thu Jul 26 16:48:41 2012 -0700
+++ b/test/tools/javac/varargs/7097436/T7097436.out	Thu Aug 02 18:22:41 2012 +0100
@@ -1,6 +1,6 @@
 T7097436.java:13:20: compiler.warn.varargs.unsafe.use.varargs.param: ls
 T7097436.java:14:25: compiler.warn.varargs.unsafe.use.varargs.param: ls
-T7097436.java:15:20: compiler.err.prob.found.req: java.util.List<java.lang.String>[], java.lang.String
-T7097436.java:16:26: compiler.err.prob.found.req: java.util.List<java.lang.String>[], java.lang.Integer[]
+T7097436.java:15:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>[], java.lang.String)
+T7097436.java:16:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>[], java.lang.Integer[])
 2 errors
 2 warnings