Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jul 26 16:48:41 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Aug 02 18:22:41 2012 +0100
     1.3 @@ -1131,8 +1131,8 @@
     1.4          for (JCTree resource : tree.resources) {
     1.5              CheckContext twrContext = new Check.NestedCheckContext(resultInfo.checkContext) {
     1.6                  @Override
     1.7 -                public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
     1.8 -                    chk.basicHandler.report(pos, found, req, diags.fragment("try.not.applicable.to.type", found));
     1.9 +                public void report(DiagnosticPosition pos, JCDiagnostic details) {
    1.10 +                    chk.basicHandler.report(pos, diags.fragment("try.not.applicable.to.type", details));
    1.11                  }
    1.12              };
    1.13              ResultInfo twrResult = new ResultInfo(VAL, syms.autoCloseableType, twrContext);
    1.14 @@ -1865,7 +1865,7 @@
    1.15  
    1.16      Type attribDiamond(Env<AttrContext> env,
    1.17                          final JCNewClass tree,
    1.18 -                        Type clazztype,
    1.19 +                        final Type clazztype,
    1.20                          List<Type> argtypes,
    1.21                          List<Type> typeargtypes) {
    1.22          if (clazztype.isErroneous() ||
    1.23 @@ -1892,27 +1892,26 @@
    1.24                      argtypes,
    1.25                      typeargtypes);
    1.26  
    1.27 +        Type owntype = types.createErrorType(clazztype);
    1.28          if (constructor.kind == MTH) {
    1.29 -            try {
    1.30 -                clazztype = rawCheckMethod(site,
    1.31 -                        constructor,
    1.32 -                        resultInfo,
    1.33 -                        localEnv,
    1.34 -                        tree.args,
    1.35 -                        argtypes,
    1.36 -                        typeargtypes,
    1.37 -                        localEnv.info.varArgs).getReturnType();
    1.38 -            } catch (Resolve.InapplicableMethodException ex) {
    1.39 -                //an error occurred while inferring uninstantiated type-variables
    1.40 -                resultInfo.checkContext.report(tree.clazz.pos(), clazztype, resultInfo.pt,
    1.41 -                        diags.fragment("cant.apply.diamond.1", diags.fragment("diamond", clazztype.tsym), ex.diagnostic));
    1.42 -                clazztype = syms.errType;
    1.43 -            }
    1.44 -        } else {
    1.45 -            clazztype = syms.errType;
    1.46 +            ResultInfo diamondResult = new ResultInfo(VAL, resultInfo.pt, new Check.NestedCheckContext(resultInfo.checkContext) {
    1.47 +                @Override
    1.48 +                public void report(DiagnosticPosition pos, JCDiagnostic details) {
    1.49 +                    enclosingContext.report(tree.clazz.pos(),
    1.50 +                            diags.fragment("cant.apply.diamond.1", diags.fragment("diamond", clazztype.tsym), details));
    1.51 +                }
    1.52 +            });
    1.53 +            owntype = checkMethod(site,
    1.54 +                    constructor,
    1.55 +                    diamondResult,
    1.56 +                    localEnv,
    1.57 +                    tree.args,
    1.58 +                    argtypes,
    1.59 +                    typeargtypes,
    1.60 +                    localEnv.info.varArgs).getReturnType();
    1.61          }
    1.62  
    1.63 -        return chk.checkClassType(tree.clazz.pos(), clazztype, true);
    1.64 +        return chk.checkClassType(tree.clazz.pos(), owntype, true);
    1.65      }
    1.66  
    1.67      /** Make an attributed null check tree.
    1.68 @@ -2687,32 +2686,6 @@
    1.69                              List<Type> argtypes,
    1.70                              List<Type> typeargtypes,
    1.71                              boolean useVarargs) {
    1.72 -        try {
    1.73 -            return rawCheckMethod(site, sym, resultInfo, env, argtrees, argtypes, typeargtypes, useVarargs);
    1.74 -        } catch (Resolve.InapplicableMethodException ex) {
    1.75 -            String key = ex.getDiagnostic() == null ?
    1.76 -                    "cant.apply.symbol" :
    1.77 -                    "cant.apply.symbol.1";
    1.78 -            log.error(env.tree.pos, key,
    1.79 -                      Kinds.kindName(sym),
    1.80 -                      sym.name == names.init ? sym.owner.name : sym.name,
    1.81 -                      rs.methodArguments(sym.type.getParameterTypes()),
    1.82 -                      rs.methodArguments(argtypes),
    1.83 -                      Kinds.kindName(sym.owner),
    1.84 -                      sym.owner.type,
    1.85 -                      ex.getDiagnostic());
    1.86 -            return types.createErrorType(site);
    1.87 -        }
    1.88 -    }
    1.89 -
    1.90 -    private Type rawCheckMethod(Type site,
    1.91 -                            Symbol sym,
    1.92 -                            ResultInfo resultInfo,
    1.93 -                            Env<AttrContext> env,
    1.94 -                            final List<JCExpression> argtrees,
    1.95 -                            List<Type> argtypes,
    1.96 -                            List<Type> typeargtypes,
    1.97 -                            boolean useVarargs) {
    1.98          // Test (5): if symbol is an instance method of a raw type, issue
    1.99          // an unchecked warning if its argument types change under erasure.
   1.100          if (allowGenerics &&
   1.101 @@ -2733,19 +2706,29 @@
   1.102          // Resolve.instantiate from the symbol's type as well as
   1.103          // any type arguments and value arguments.
   1.104          noteWarner.clear();
   1.105 -        Type owntype = rs.rawInstantiate(env,
   1.106 -                                          site,
   1.107 -                                          sym,
   1.108 -                                          resultInfo,
   1.109 -                                          argtypes,
   1.110 -                                          typeargtypes,
   1.111 -                                          true,
   1.112 -                                          useVarargs,
   1.113 -                                          noteWarner);
   1.114 -
   1.115 -        boolean unchecked = noteWarner.hasNonSilentLint(LintCategory.UNCHECKED);
   1.116 -
   1.117 -        return chk.checkMethod(owntype, sym, env, argtrees, argtypes, useVarargs, unchecked);
   1.118 +        try {
   1.119 +            Type owntype = rs.rawInstantiate(
   1.120 +                    env,
   1.121 +                    site,
   1.122 +                    sym,
   1.123 +                    resultInfo,
   1.124 +                    argtypes,
   1.125 +                    typeargtypes,
   1.126 +                    allowBoxing,
   1.127 +                    useVarargs,
   1.128 +                    noteWarner);
   1.129 +
   1.130 +            return chk.checkMethod(owntype, sym, env, argtrees, argtypes, useVarargs,
   1.131 +                    noteWarner.hasNonSilentLint(LintCategory.UNCHECKED));
   1.132 +        } catch (Infer.InferenceException ex) {
   1.133 +            //invalid target type - propagate exception outwards or report error
   1.134 +            //depending on the current check context
   1.135 +            resultInfo.checkContext.report(env.tree.pos(), ex.getDiagnostic());
   1.136 +            return types.createErrorType(site);
   1.137 +        } catch (Resolve.InapplicableMethodException ex) {
   1.138 +            Assert.error();
   1.139 +            return null;
   1.140 +        }
   1.141      }
   1.142  
   1.143      /**

     2.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jul 26 16:48:41 2012 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Aug 02 18:22:41 2012 +0100
     2.3 @@ -426,7 +426,7 @@
     2.4          /**
     2.5           * Report a check error
     2.6           */
     2.7 -        void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details);
     2.8 +        void report(DiagnosticPosition pos, JCDiagnostic details);
     2.9          /**
    2.10           * Obtain a warner for this check context
    2.11           */
    2.12 @@ -450,8 +450,8 @@
    2.13              return enclosingContext.compatible(found, req, warn);
    2.14          }
    2.15  
    2.16 -        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
    2.17 -            enclosingContext.report(pos, found, req, details);
    2.18 +        public void report(DiagnosticPosition pos, JCDiagnostic details) {
    2.19 +            enclosingContext.report(pos, details);
    2.20          }
    2.21  
    2.22          public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
    2.23 @@ -463,12 +463,8 @@
    2.24       * Check context to be used when evaluating assignment/return statements
    2.25       */
    2.26      CheckContext basicHandler = new CheckContext() {
    2.27 -        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
    2.28 -            if (details == null) {
    2.29 -                log.error(pos, "prob.found.req", found, req);
    2.30 -            } else {
    2.31 -                log.error(pos, "prob.found.req.1", details);
    2.32 -            }
    2.33 +        public void report(DiagnosticPosition pos, JCDiagnostic details) {
    2.34 +            log.error(pos, "prob.found.req", details);
    2.35          }
    2.36          public boolean compatible(Type found, Type req, Warner warn) {
    2.37              return types.isAssignable(found, req, warn);
    2.38 @@ -498,10 +494,10 @@
    2.39              return found;
    2.40          } else {
    2.41              if (found.tag <= DOUBLE && req.tag <= DOUBLE) {
    2.42 -                checkContext.report(pos, found, req, diags.fragment("possible.loss.of.precision"));
    2.43 +                checkContext.report(pos, diags.fragment("possible.loss.of.precision", found, req));
    2.44                  return types.createErrorType(found);
    2.45              }
    2.46 -            checkContext.report(pos, found, req, null);
    2.47 +            checkContext.report(pos, diags.fragment("inconvertible.types", found, req));
    2.48              return types.createErrorType(found);
    2.49          }
    2.50      }
    2.51 @@ -519,7 +515,7 @@
    2.52          if (types.isCastable(found, req, castWarner(pos, found, req))) {
    2.53              return req;
    2.54          } else {
    2.55 -            checkContext.report(pos, found, req, diags.fragment("inconvertible.types", found, req));
    2.56 +            checkContext.report(pos, diags.fragment("inconvertible.types", found, req));
    2.57              return types.createErrorType(found);
    2.58          }
    2.59      }

     3.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jul 26 16:48:41 2012 -0700
     3.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Aug 02 18:22:41 2012 +0100
     3.3 @@ -382,14 +382,14 @@
     3.4              }
     3.5  
     3.6              public InapplicableMethodException arityMismatch() {
     3.7 -                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch");
     3.8 +                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch", inferenceVars(undetvars));
     3.9              }
    3.10 -            public InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected) {
    3.11 +            public InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details) {
    3.12                  String key = varargs ?
    3.13 -                    "infer.varargs.argument.mismatch" :
    3.14 -                    "infer.no.conforming.assignment.exists";
    3.15 +                        "infer.varargs.argument.mismatch" :
    3.16 +                        "infer.no.conforming.assignment.exists";
    3.17                  return unambiguousNoInstanceException.setMessage(key,
    3.18 -                        inferenceVars(undetvars), found, expected);
    3.19 +                        inferenceVars(undetvars), details);
    3.20              }
    3.21              public InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected) {
    3.22                  return unambiguousNoInstanceException.setMessage("inaccessible.varargs.type",

     4.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Jul 26 16:48:41 2012 -0700
     4.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Aug 02 18:22:41 2012 +0100
     4.3 @@ -550,7 +550,7 @@
     4.4          /* The number of actuals and formals differ */
     4.5          InapplicableMethodException arityMismatch();
     4.6          /* An actual argument type does not conform to the corresponding formal type */
     4.7 -        InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected);
     4.8 +        InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details);
     4.9          /* The element type of a varargs is not accessible in the current context */
    4.10          InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected);
    4.11      }
    4.12 @@ -565,12 +565,12 @@
    4.13              public InapplicableMethodException arityMismatch() {
    4.14                  return inapplicableMethodException.setMessage("arg.length.mismatch");
    4.15              }
    4.16 -            public InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected) {
    4.17 +            public InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details) {
    4.18                  String key = varargs ?
    4.19                          "varargs.argument.mismatch" :
    4.20                          "no.conforming.assignment.exists";
    4.21                  return inapplicableMethodException.setMessage(key,
    4.22 -                        found, expected);
    4.23 +                        details);
    4.24              }
    4.25              public InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected) {
    4.26                  return inapplicableMethodException.setMessage("inaccessible.varargs.type",
    4.27 @@ -667,12 +667,8 @@
    4.28              this.rsWarner = rsWarner;
    4.29          }
    4.30  
    4.31 -        public void report(DiagnosticPosition pos, Type found, Type req, JCDiagnostic details) {
    4.32 -            throw handler.argumentMismatch(useVarargs, found, req);
    4.33 -        }
    4.34 -
    4.35 -        public Type rawInstantiatePoly(ForAll found, Type req, Warner warn) {
    4.36 -            throw new AssertionError("ForAll in argument position");
    4.37 +        public void report(DiagnosticPosition pos, JCDiagnostic details) {
    4.38 +            throw handler.argumentMismatch(useVarargs, details);
    4.39          }
    4.40  
    4.41          public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {

     5.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jul 26 16:48:41 2012 -0700
     5.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Aug 02 18:22:41 2012 +0100
     5.3 @@ -1497,14 +1497,8 @@
     5.4  
     5.5  #####
     5.6  
     5.7 -# 0: type, 1: type
     5.8 +# 0: message segment
     5.9  compiler.err.prob.found.req=\
    5.10 -    incompatible types\n\
    5.11 -    required: {1}\n\
    5.12 -    found: {0}
    5.13 -
    5.14 -# 0: message segment
    5.15 -compiler.err.prob.found.req.1=\
    5.16      incompatible types: {0}
    5.17  
    5.18  # 0: message segment, 1: type, 2: type
    5.19 @@ -1517,8 +1511,9 @@
    5.20  compiler.misc.inconvertible.types=\
    5.21      {0} cannot be converted to {1}
    5.22  
    5.23 +# 0: type, 1: type
    5.24  compiler.misc.possible.loss.of.precision=\
    5.25 -    possible loss of precision
    5.26 +    possible lossy conversion from {0} to {1}
    5.27  
    5.28  compiler.misc.unchecked.assign=\
    5.29      unchecked conversion
    5.30 @@ -1537,8 +1532,8 @@
    5.31  
    5.32  # 0: type
    5.33  compiler.misc.try.not.applicable.to.type=\
    5.34 -    try-with-resources not applicable to variable type {0}\n\
    5.35 -    (expected a variable of type java.lang.AutoCloseable)
    5.36 +    try-with-resources not applicable to variable type\n\
    5.37 +    ({0})
    5.38  
    5.39  #####
    5.40  
    5.41 @@ -1589,16 +1584,20 @@
    5.42  compiler.misc.infer.no.conforming.instance.exists=\
    5.43      no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
    5.44  
    5.45 -# 0: list of type, 1: type, 2: type
    5.46 +# 0: list of type, 1: message segment
    5.47  compiler.misc.infer.no.conforming.assignment.exists=\
    5.48 -    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
    5.49 -
    5.50 +    cannot infer type-variable(s) {0}\n\
    5.51 +    (argument mismatch; {1})
    5.52 +
    5.53 +# 0: list of type
    5.54  compiler.misc.infer.arg.length.mismatch=\
    5.55 -    cannot instantiate from arguments because actual and formal argument lists differ in length
    5.56 -
    5.57 -# 0: list of type, 1: type, 2: type
    5.58 +    cannot infer type-variable(s) {0}\n\
    5.59 +    (actual and formal argument lists differ in length)
    5.60 +
    5.61 +# 0: list of type, 1: message segment
    5.62  compiler.misc.infer.varargs.argument.mismatch=\
    5.63 -    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to vararg element type {2}
    5.64 +    cannot infer type-variable(s) {0}\n\
    5.65 +    (varargs mismatch; {1})
    5.66  
    5.67  # 0: type, 1: list of type
    5.68  compiler.misc.inferred.do.not.conform.to.upper.bounds=\
    5.69 @@ -1637,13 +1636,13 @@
    5.70  compiler.misc.arg.length.mismatch=\
    5.71      actual and formal argument lists differ in length
    5.72  
    5.73 -# 0: type, 1: type
    5.74 +# 0: message segment
    5.75  compiler.misc.no.conforming.assignment.exists=\
    5.76 -    actual argument {0} cannot be converted to {1} by method invocation conversion
    5.77 -
    5.78 -# 0: type, 1: type
    5.79 +    argument mismatch; {0}
    5.80 +
    5.81 +# 0: message segment
    5.82  compiler.misc.varargs.argument.mismatch=\
    5.83 -    argument type {0} does not conform to vararg element type {1}
    5.84 +    varargs mismatch; {0}
    5.85  
    5.86  #####
    5.87  

     6.1 --- a/test/tools/javac/6840059/T6840059.out	Thu Jul 26 16:48:41 2012 -0700
     6.2 +++ b/test/tools/javac/6840059/T6840059.out	Thu Aug 02 18:22:41 2012 +0100
     6.3 @@ -1,3 +1,3 @@
     6.4 -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)
     6.5 +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))
     6.6  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)
     6.7  2 errors

     7.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog	Thu Jul 26 16:48:41 2012 -0700
     7.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog	Thu Aug 02 18:22:41 2012 +0100
     7.3 @@ -1,2 +1,2 @@
     7.4 -TestCast6979683_BAD34.java:34:49: compiler.err.prob.found.req: java.lang.Number, boolean
     7.5 +TestCast6979683_BAD34.java:34:49: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, boolean)
     7.6  1 error

     8.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog	Thu Jul 26 16:48:41 2012 -0700
     8.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog	Thu Aug 02 18:22:41 2012 +0100
     8.3 @@ -1,2 +1,2 @@
     8.4 -TestCast6979683_BAD35.java:35:45: compiler.err.prob.found.req: java.lang.Number, int
     8.5 +TestCast6979683_BAD35.java:35:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, int)
     8.6  1 error

     9.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog	Thu Jul 26 16:48:41 2012 -0700
     9.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog	Thu Aug 02 18:22:41 2012 +0100
     9.3 @@ -1,2 +1,2 @@
     9.4 -TestCast6979683_BAD36.java:36:58: compiler.err.prob.found.req: java.lang.Comparable<java.lang.Integer>, int
     9.5 +TestCast6979683_BAD36.java:36:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Integer>, int)
     9.6  1 error

    10.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog	Thu Jul 26 16:48:41 2012 -0700
    10.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog	Thu Aug 02 18:22:41 2012 +0100
    10.3 @@ -1,2 +1,2 @@
    10.4 -TestCast6979683_BAD37.java:37:61: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Short>, int)
    10.5 +TestCast6979683_BAD37.java:37:61: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Short>, int)
    10.6  1 error

    11.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog	Thu Jul 26 16:48:41 2012 -0700
    11.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog	Thu Aug 02 18:22:41 2012 +0100
    11.3 @@ -1,2 +1,2 @@
    11.4 -TestCast6979683_BAD38.java:38:62: compiler.err.prob.found.req: java.lang.Comparable<java.lang.Character>, float
    11.5 +TestCast6979683_BAD38.java:38:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Comparable<java.lang.Character>, float)
    11.6  1 error

    12.1 --- a/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog	Thu Jul 26 16:48:41 2012 -0700
    12.2 +++ b/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog	Thu Aug 02 18:22:41 2012 +0100
    12.3 @@ -1,2 +1,2 @@
    12.4 -TestCast6979683_BAD39.java:39:53: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Number, char)
    12.5 +TestCast6979683_BAD39.java:39:53: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Number, char)
    12.6  1 error

    13.1 --- a/test/tools/javac/7132880/T7132880.out	Thu Jul 26 16:48:41 2012 -0700
    13.2 +++ b/test/tools/javac/7132880/T7132880.out	Thu Aug 02 18:22:41 2012 +0100
    13.3 @@ -1,4 +1,4 @@
    13.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)
    13.5 -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))}
    13.6 +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))
    13.7 +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)))}
    13.8  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
    13.9  3 errors

    14.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Jul 26 16:48:41 2012 -0700
    14.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 02 18:22:41 2012 +0100
    14.3 @@ -1,2 +1,2 @@
    14.4 -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)
    14.5 +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))
    14.6  1 error

    15.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Jul 26 16:48:41 2012 -0700
    15.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 02 18:22:41 2012 +0100
    15.3 @@ -1,3 +1,3 @@
    15.4 -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)
    15.5 +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))
    15.6  - 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))}
    15.7  1 error

    16.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Jul 26 16:48:41 2012 -0700
    16.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 02 18:22:41 2012 +0100
    16.3 @@ -1,2 +1,2 @@
    16.4 -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)
    16.5 +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))
    16.6  1 error

    17.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Jul 26 16:48:41 2012 -0700
    17.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 02 18:22:41 2012 +0100
    17.3 @@ -1,3 +1,3 @@
    17.4 -T6722234d.java:18:20: compiler.err.prob.found.req: compiler.misc.intersection.type: 1, T6722234d.A
    17.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
    17.6  - 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)}
    17.7  1 error

    18.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Jul 26 16:48:41 2012 -0700
    18.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 02 18:22:41 2012 +0100
    18.3 @@ -1,3 +1,3 @@
    18.4 -T6722234d.java:18:20: compiler.err.prob.found.req: compiler.misc.intersection.type: 1, T6722234d.A
    18.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.intersection.type: 1, T6722234d.A)
    18.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
    18.7  1 error

    19.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Jul 26 16:48:41 2012 -0700
    19.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 02 18:22:41 2012 +0100
    19.3 @@ -1,4 +1,4 @@
    19.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, ?>))}
    19.5 -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))}
    19.6 -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))}
    19.7 +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, ?>))}
    19.8 +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))}
    19.9 +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))}
   19.10  3 errors

    20.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Jul 26 16:48:41 2012 -0700
    20.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 02 18:22:41 2012 +0100
    20.3 @@ -1,3 +1,3 @@
    20.4 -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>>)
    20.5 +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>>))
    20.6  - 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>>))}
    20.7  1 error

    21.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Jul 26 16:48:41 2012 -0700
    21.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 02 18:22:41 2012 +0100
    21.3 @@ -1,3 +1,3 @@
    21.4 -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)
    21.5 +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))
    21.6  - 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)}
    21.7  1 error

    22.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Jul 26 16:48:41 2012 -0700
    22.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 02 18:22:41 2012 +0100
    22.3 @@ -1,4 +1,4 @@
    22.4  T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    22.5 -T6400189a.java:14:35: compiler.err.prob.found.req: java.lang.annotation.Annotation, java.lang.annotation.Documented
    22.6 +T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.annotation.Annotation, java.lang.annotation.Documented)
    22.7  1 error
    22.8  1 warning

    23.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Jul 26 16:48:41 2012 -0700
    23.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 02 18:22:41 2012 +0100
    23.3 @@ -1,4 +1,4 @@
    23.4  T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    23.5 -T6400189b.java:24:24: compiler.err.prob.found.req: java.lang.Object, java.lang.Integer
    23.6 +T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.Integer)
    23.7  1 error
    23.8  1 warning

    24.1 --- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Thu Jul 26 16:48:41 2012 -0700
    24.2 +++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out	Thu Aug 02 18:22:41 2012 +0100
    24.3 @@ -1,2 +1,2 @@
    24.4 -BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: int, java.lang.String
    24.5 +BadlyTypedLabel1.java:13:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
    24.6  1 error

    25.1 --- a/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Thu Jul 26 16:48:41 2012 -0700
    25.2 +++ b/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out	Thu Aug 02 18:22:41 2012 +0100
    25.3 @@ -1,2 +1,2 @@
    25.4 -BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: java.math.RoundingMode, java.lang.String
    25.5 +BadlyTypedLabel2.java:15:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.math.RoundingMode, java.lang.String)
    25.6  1 error

    26.1 --- a/test/tools/javac/T6326754.out	Thu Jul 26 16:48:41 2012 -0700
    26.2 +++ b/test/tools/javac/T6326754.out	Thu Aug 02 18:22:41 2012 +0100
    26.3 @@ -1,6 +1,6 @@
    26.4  T6326754.java:44:12: compiler.err.name.clash.same.erasure: TestConstructor(T), TestConstructor(K)
    26.5  T6326754.java:52:17: compiler.err.name.clash.same.erasure: setT(K), setT(T)
    26.6 -T6326754.java:64:18: compiler.err.prob.found.req: T, T
    26.7 +T6326754.java:64:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, T)
    26.8  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)
    26.9  - compiler.note.unchecked.filename: T6326754.java
   26.10  - compiler.note.unchecked.recompile

    27.1 --- a/test/tools/javac/TryWithResources/TwrOnNonResource.out	Thu Jul 26 16:48:41 2012 -0700
    27.2 +++ b/test/tools/javac/TryWithResources/TwrOnNonResource.out	Thu Aug 02 18:22:41 2012 +0100
    27.3 @@ -1,4 +1,4 @@
    27.4 -TwrOnNonResource.java:12:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
    27.5 -TwrOnNonResource.java:15:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
    27.6 -TwrOnNonResource.java:18:30: compiler.err.prob.found.req.1: (compiler.misc.try.not.applicable.to.type: TwrOnNonResource)
    27.7 +TwrOnNonResource.java:12:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
    27.8 +TwrOnNonResource.java:15:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
    27.9 +TwrOnNonResource.java:18:30: compiler.err.prob.found.req: (compiler.misc.try.not.applicable.to.type: (compiler.misc.inconvertible.types: TwrOnNonResource, java.lang.AutoCloseable))
   27.10  3 errors

    28.1 --- a/test/tools/javac/cast/6270087/T6270087neg.out	Thu Jul 26 16:48:41 2012 -0700
    28.2 +++ b/test/tools/javac/cast/6270087/T6270087neg.out	Thu Aug 02 18:22:41 2012 +0100
    28.3 @@ -1,2 +1,2 @@
    28.4 -T6270087neg.java:36:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6270087neg.Foo<V>, T6270087neg.Foo<U>)
    28.5 +T6270087neg.java:36:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6270087neg.Foo<V>, T6270087neg.Foo<U>)
    28.6  1 error

    29.1 --- a/test/tools/javac/cast/6557182/T6557182.out	Thu Jul 26 16:48:41 2012 -0700
    29.2 +++ b/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 02 18:22:41 2012 +0100
    29.3 @@ -1,4 +1,4 @@
    29.4 -T6557182.java:12:56: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T, java.lang.Comparable<java.lang.Integer>)
    29.5 +T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, java.lang.Comparable<java.lang.Integer>)
    29.6  T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    29.7  1 error
    29.8  1 warning

    30.1 --- a/test/tools/javac/cast/6665356/T6665356.out	Thu Jul 26 16:48:41 2012 -0700
    30.2 +++ b/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 02 18:22:41 2012 +0100
    30.3 @@ -1,8 +1,8 @@
    30.4 -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>)
    30.5 -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>)
    30.6 -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>)
    30.7 -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>)
    30.8 -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>)
    30.9 -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>)
   30.10 -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>)
   30.11 +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>)
   30.12 +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>)
   30.13 +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>)
   30.14 +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>)
   30.15 +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>)
   30.16 +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>)
   30.17 +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>)
   30.18  7 errors

    31.1 --- a/test/tools/javac/cast/6795580/T6795580.out	Thu Jul 26 16:48:41 2012 -0700
    31.2 +++ b/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 02 18:22:41 2012 +0100
    31.3 @@ -1,8 +1,8 @@
    31.4 -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>[])
    31.5 -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>[])
    31.6 -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>[])
    31.7 -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>[])
    31.8 -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>[])
    31.9 -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>[])
   31.10 -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>[])
   31.11 +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>[])
   31.12 +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>[])
   31.13 +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>[])
   31.14 +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>[])
   31.15 +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>[])
   31.16 +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>[])
   31.17 +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>[])
   31.18  7 errors

    32.1 --- a/test/tools/javac/cast/6932571/T6932571neg.out	Thu Jul 26 16:48:41 2012 -0700
    32.2 +++ b/test/tools/javac/cast/6932571/T6932571neg.out	Thu Aug 02 18:22:41 2012 +0100
    32.3 @@ -1,2 +1,2 @@
    32.4 -T6932571neg.java:39:19: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T6932571neg.S, G)
    32.5 +T6932571neg.java:39:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T6932571neg.S, G)
    32.6  1 error

    33.1 --- a/test/tools/javac/cast/7005095/T7005095neg.out	Thu Jul 26 16:48:41 2012 -0700
    33.2 +++ b/test/tools/javac/cast/7005095/T7005095neg.out	Thu Aug 02 18:22:41 2012 +0100
    33.3 @@ -1,2 +1,2 @@
    33.4 -T7005095neg.java:13:25: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: T7005095pos.FooImpl, T7005095pos.Foo<T>)
    33.5 +T7005095neg.java:13:25: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T7005095pos.FooImpl, T7005095pos.Foo<T>)
    33.6  1 error

    34.1 --- a/test/tools/javac/cast/7005671/T7005671.out	Thu Jul 26 16:48:41 2012 -0700
    34.2 +++ b/test/tools/javac/cast/7005671/T7005671.out	Thu Aug 02 18:22:41 2012 +0100
    34.3 @@ -1,17 +1,17 @@
    34.4 -T7005671.java:12:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: byte[], X[])
    34.5 -T7005671.java:13:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: short[], X[])
    34.6 -T7005671.java:14:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: int[], X[])
    34.7 -T7005671.java:15:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: long[], X[])
    34.8 -T7005671.java:16:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: float[], X[])
    34.9 -T7005671.java:17:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: double[], X[])
   34.10 -T7005671.java:18:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: char[], X[])
   34.11 -T7005671.java:19:26: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: boolean[], X[])
   34.12 -T7005671.java:23:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], byte[])
   34.13 -T7005671.java:24:30: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], short[])
   34.14 -T7005671.java:25:28: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], int[])
   34.15 -T7005671.java:26:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], long[])
   34.16 -T7005671.java:27:30: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], float[])
   34.17 -T7005671.java:28:31: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], double[])
   34.18 -T7005671.java:29:29: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], char[])
   34.19 -T7005671.java:30:32: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: X[], boolean[])
   34.20 +T7005671.java:12:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: byte[], X[])
   34.21 +T7005671.java:13:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: short[], X[])
   34.22 +T7005671.java:14:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int[], X[])
   34.23 +T7005671.java:15:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: long[], X[])
   34.24 +T7005671.java:16:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: float[], X[])
   34.25 +T7005671.java:17:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: double[], X[])
   34.26 +T7005671.java:18:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: char[], X[])
   34.27 +T7005671.java:19:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: boolean[], X[])
   34.28 +T7005671.java:23:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], byte[])
   34.29 +T7005671.java:24:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], short[])
   34.30 +T7005671.java:25:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], int[])
   34.31 +T7005671.java:26:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], long[])
   34.32 +T7005671.java:27:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], float[])
   34.33 +T7005671.java:28:31: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], double[])
   34.34 +T7005671.java:29:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], char[])
   34.35 +T7005671.java:30:32: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X[], boolean[])
   34.36  16 errors

    35.1 --- a/test/tools/javac/diags/examples/CantApplyDiamond1.java	Thu Jul 26 16:48:41 2012 -0700
    35.2 +++ b/test/tools/javac/diags/examples/CantApplyDiamond1.java	Thu Aug 02 18:22:41 2012 +0100
    35.3 @@ -21,7 +21,7 @@
    35.4   * questions.
    35.5   */
    35.6  
    35.7 -// key: compiler.err.prob.found.req.1
    35.8 +// key: compiler.err.prob.found.req
    35.9  // key: compiler.misc.cant.apply.diamond.1
   35.10  // key: compiler.misc.inferred.do.not.conform.to.upper.bounds
   35.11  // key: compiler.misc.diamond

    36.1 --- a/test/tools/javac/diags/examples/IncompatibleTypes1.java	Thu Jul 26 16:48:41 2012 -0700
    36.2 +++ b/test/tools/javac/diags/examples/IncompatibleTypes1.java	Thu Aug 02 18:22:41 2012 +0100
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it
   36.10 @@ -22,7 +22,7 @@
   36.11   */
   36.12  
   36.13  // key: compiler.misc.infer.no.conforming.instance.exists
   36.14 -// key: compiler.err.cant.apply.symbol.1
   36.15 +// key: compiler.err.prob.found.req
   36.16  
   36.17  class IncompatibleTypes1<V> {
   36.18      <T> IncompatibleTypes1<Integer> m() {

    37.1 --- a/test/tools/javac/diags/examples/InconvertibleTypes.java	Thu Jul 26 16:48:41 2012 -0700
    37.2 +++ b/test/tools/javac/diags/examples/InconvertibleTypes.java	Thu Aug 02 18:22:41 2012 +0100
    37.3 @@ -22,7 +22,7 @@
    37.4   */
    37.5  
    37.6  // key: compiler.misc.inconvertible.types
    37.7 -// key: compiler.err.prob.found.req.1
    37.8 +// key: compiler.err.prob.found.req
    37.9  
   37.10  class InconvertibleTypes {
   37.11      class Outer<S> {

    38.1 --- a/test/tools/javac/diags/examples/InferNoConformingAssignment.java	Thu Jul 26 16:48:41 2012 -0700
    38.2 +++ b/test/tools/javac/diags/examples/InferNoConformingAssignment.java	Thu Aug 02 18:22:41 2012 +0100
    38.3 @@ -22,6 +22,7 @@
    38.4   */
    38.5  
    38.6  // key: compiler.err.cant.apply.symbol.1
    38.7 +// key: compiler.misc.inconvertible.types
    38.8  // key: compiler.misc.infer.no.conforming.assignment.exists
    38.9  
   38.10  import java.util.*;

    39.1 --- a/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java	Thu Jul 26 16:48:41 2012 -0700
    39.2 +++ b/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java	Thu Aug 02 18:22:41 2012 +0100
    39.3 @@ -23,6 +23,7 @@
    39.4  
    39.5  // key: compiler.err.cant.apply.symbol.1
    39.6  // key: compiler.misc.infer.varargs.argument.mismatch
    39.7 +// key: compiler.misc.inconvertible.types
    39.8  
    39.9  class InferVarargsArgumentMismatch {
   39.10      <X> void m(X x1, String... xs) {}

    40.1 --- a/test/tools/javac/diags/examples/InferredDoNotConformToLower.java	Thu Jul 26 16:48:41 2012 -0700
    40.2 +++ b/test/tools/javac/diags/examples/InferredDoNotConformToLower.java	Thu Aug 02 18:22:41 2012 +0100
    40.3 @@ -21,7 +21,7 @@
    40.4   * questions.
    40.5   */
    40.6  
    40.7 -// key: compiler.err.cant.apply.symbol.1
    40.8 +// key: compiler.err.prob.found.req
    40.9  // key: compiler.misc.inferred.do.not.conform.to.lower.bounds
   40.10  
   40.11  import java.util.*;

    41.1 --- a/test/tools/javac/diags/examples/KindnameConstructor.java	Thu Jul 26 16:48:41 2012 -0700
    41.2 +++ b/test/tools/javac/diags/examples/KindnameConstructor.java	Thu Aug 02 18:22:41 2012 +0100
    41.3 @@ -27,6 +27,7 @@
    41.4  // key: compiler.err.cant.apply.symbol.1
    41.5  // key: compiler.misc.arg.length.mismatch
    41.6  // key: compiler.misc.no.conforming.assignment.exists
    41.7 +// key: compiler.misc.inconvertible.types
    41.8  // key: compiler.misc.count.error.plural
    41.9  // key: compiler.err.error
   41.10  // run: backdoor

    42.1 --- a/test/tools/javac/diags/examples/NoUniqueMaximalInstance.java	Thu Jul 26 16:48:41 2012 -0700
    42.2 +++ b/test/tools/javac/diags/examples/NoUniqueMaximalInstance.java	Thu Aug 02 18:22:41 2012 +0100
    42.3 @@ -21,7 +21,7 @@
    42.4   * questions.
    42.5   */
    42.6  
    42.7 -// key: compiler.err.cant.apply.symbol.1
    42.8 +// key: compiler.err.prob.found.req
    42.9  // key: compiler.misc.no.unique.maximal.instance.exists
   42.10  
   42.11  class NoUniqueMaximalInstance {

    43.1 --- a/test/tools/javac/diags/examples/NotApplicableMethodFound.java	Thu Jul 26 16:48:41 2012 -0700
    43.2 +++ b/test/tools/javac/diags/examples/NotApplicableMethodFound.java	Thu Aug 02 18:22:41 2012 +0100
    43.3 @@ -25,6 +25,7 @@
    43.4  // key: compiler.note.verbose.resolve.multi.1
    43.5  // key: compiler.err.cant.apply.symbol.1
    43.6  // key: compiler.misc.no.conforming.assignment.exists
    43.7 +// key: compiler.misc.inconvertible.types
    43.8  // options: -XDverboseResolution=inapplicable,failure
    43.9  
   43.10  class NotApplicableMethodFound {

    44.1 --- a/test/tools/javac/diags/examples/PossibleLossPrecision.java	Thu Jul 26 16:48:41 2012 -0700
    44.2 +++ b/test/tools/javac/diags/examples/PossibleLossPrecision.java	Thu Aug 02 18:22:41 2012 +0100
    44.3 @@ -22,7 +22,7 @@
    44.4   */
    44.5  
    44.6  // key: compiler.misc.possible.loss.of.precision
    44.7 -// key: compiler.err.prob.found.req.1
    44.8 +// key: compiler.err.prob.found.req
    44.9  
   44.10  class PossibleLossPrecision {
   44.11      long l;

    45.1 --- a/test/tools/javac/diags/examples/ResourceNotApplicableToType.java	Thu Jul 26 16:48:41 2012 -0700
    45.2 +++ b/test/tools/javac/diags/examples/ResourceNotApplicableToType.java	Thu Aug 02 18:22:41 2012 +0100
    45.3 @@ -22,7 +22,8 @@
    45.4   */
    45.5  
    45.6  // key: compiler.misc.try.not.applicable.to.type
    45.7 -// key: compiler.err.prob.found.req.1
    45.8 +// key: compiler.err.prob.found.req
    45.9 +// key: compiler.misc.inconvertible.types
   45.10  
   45.11  class ResourceNotApplicableToType {
   45.12      void m() {

    46.1 --- a/test/tools/javac/diags/examples/VarargsArgumentMismatch.java	Thu Jul 26 16:48:41 2012 -0700
    46.2 +++ b/test/tools/javac/diags/examples/VarargsArgumentMismatch.java	Thu Aug 02 18:22:41 2012 +0100
    46.3 @@ -23,6 +23,7 @@
    46.4  
    46.5  // key: compiler.err.cant.apply.symbol.1
    46.6  // key: compiler.misc.varargs.argument.mismatch
    46.7 +// key: compiler.misc.inconvertible.types
    46.8  
    46.9  class VarargsArgumentMismatch {
   46.10      void m(String s, Integer... is) {}

    47.1 --- a/test/tools/javac/diags/examples/VerboseResolveMulti1.java	Thu Jul 26 16:48:41 2012 -0700
    47.2 +++ b/test/tools/javac/diags/examples/VerboseResolveMulti1.java	Thu Aug 02 18:22:41 2012 +0100
    47.3 @@ -25,6 +25,7 @@
    47.4  // key: compiler.note.verbose.resolve.multi.1
    47.5  // key: compiler.err.cant.apply.symbol.1
    47.6  // key: compiler.misc.no.conforming.assignment.exists
    47.7 +// key: compiler.misc.inconvertible.types
    47.8  // options: -XDverboseResolution=inapplicable,failure
    47.9  
   47.10  class VerboseResolveMulti1 {

    48.1 --- a/test/tools/javac/diags/examples/WhereFreshTvar.java	Thu Jul 26 16:48:41 2012 -0700
    48.2 +++ b/test/tools/javac/diags/examples/WhereFreshTvar.java	Thu Aug 02 18:22:41 2012 +0100
    48.3 @@ -23,8 +23,7 @@
    48.4  
    48.5  // key: compiler.misc.where.fresh.typevar
    48.6  // key: compiler.misc.where.description.typevar
    48.7 -// key: compiler.err.cant.apply.symbol.1
    48.8 -// key: compiler.misc.no.args
    48.9 +// key: compiler.err.prob.found.req
   48.10  // key: compiler.misc.inferred.do.not.conform.to.upper.bounds
   48.11  // options: -XDdiags=where,simpleNames
   48.12  // run: simple

    49.1 --- a/test/tools/javac/diags/examples/WhereIntersection.java	Thu Jul 26 16:48:41 2012 -0700
    49.2 +++ b/test/tools/javac/diags/examples/WhereIntersection.java	Thu Aug 02 18:22:41 2012 +0100
    49.3 @@ -25,6 +25,7 @@
    49.4  // key: compiler.misc.where.description.intersection
    49.5  // key: compiler.misc.intersection.type
    49.6  // key: compiler.err.prob.found.req
    49.7 +// key: compiler.misc.inconvertible.types
    49.8  // options: -XDdiags=where
    49.9  // run: simple
   49.10  

    50.1 --- a/test/tools/javac/diags/examples/WhereTypeVar.java	Thu Jul 26 16:48:41 2012 -0700
    50.2 +++ b/test/tools/javac/diags/examples/WhereTypeVar.java	Thu Aug 02 18:22:41 2012 +0100
    50.3 @@ -26,6 +26,7 @@
    50.4  // key: compiler.misc.type.var
    50.5  // key: compiler.err.cant.apply.symbol.1
    50.6  // key: compiler.misc.no.conforming.assignment.exists
    50.7 +// key: compiler.misc.inconvertible.types
    50.8  // options: -XDdiags=where,disambiguateTvars
    50.9  // run: simple
   50.10  

    51.1 --- a/test/tools/javac/generics/6207386/T6207386.out	Thu Jul 26 16:48:41 2012 -0700
    51.2 +++ b/test/tools/javac/generics/6207386/T6207386.out	Thu Aug 02 18:22:41 2012 +0100
    51.3 @@ -1,2 +1,2 @@
    51.4 -T6207386.java:13:30: compiler.err.prob.found.req: X, T6207386.F<? super X>
    51.5 +T6207386.java:13:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: X, T6207386.F<? super X>)
    51.6  1 error

    52.1 --- a/test/tools/javac/generics/diamond/neg/Neg05.out	Thu Jul 26 16:48:41 2012 -0700
    52.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out	Thu Aug 02 18:22:41 2012 +0100
    52.3 @@ -1,19 +1,19 @@
    52.4  Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
    52.5 -Neg05.java:19:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
    52.6 +Neg05.java:19:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
    52.7  Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
    52.8 -Neg05.java:20:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
    52.9 +Neg05.java:20:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
   52.10  Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
   52.11 -Neg05.java:21:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
   52.12 +Neg05.java:21:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
   52.13  Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
   52.14 -Neg05.java:22:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
   52.15 +Neg05.java:22:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
   52.16  Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
   52.17 -Neg05.java:24:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
   52.18 +Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
   52.19  Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
   52.20 -Neg05.java:25:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
   52.21 +Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
   52.22  Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
   52.23 -Neg05.java:26:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
   52.24 +Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
   52.25  Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
   52.26 -Neg05.java:27:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
   52.27 +Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
   52.28  Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param
   52.29  Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param
   52.30  Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param

    53.1 --- a/test/tools/javac/generics/diamond/neg/Neg06.out	Thu Jul 26 16:48:41 2012 -0700
    53.2 +++ b/test/tools/javac/generics/diamond/neg/Neg06.out	Thu Aug 02 18:22:41 2012 +0100
    53.3 @@ -1,2 +1,2 @@
    53.4 -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))
    53.5 +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))
    53.6  1 error

    54.1 --- a/test/tools/javac/generics/diamond/neg/Neg10.out	Thu Jul 26 16:48:41 2012 -0700
    54.2 +++ b/test/tools/javac/generics/diamond/neg/Neg10.out	Thu Aug 02 18:22:41 2012 +0100
    54.3 @@ -1,2 +1,2 @@
    54.4 -Neg10.java:16:22: compiler.err.prob.found.req: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>
    54.5 +Neg10.java:16:22: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg10.Foo<java.lang.Integer>, Neg10.Foo<java.lang.Number>)
    54.6  1 error

    55.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Jul 26 16:48:41 2012 -0700
    55.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 02 18:22:41 2012 +0100
    55.3 @@ -1,3 +1,3 @@
    55.4 -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)
    55.5 -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)
    55.6 +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)
    55.7 +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)
    55.8  2 errors

    56.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Jul 26 16:48:41 2012 -0700
    56.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 02 18:22:41 2012 +0100
    56.3 @@ -1,5 +1,5 @@
    56.4 -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))}
    56.5 -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))}
    56.6 +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))}
    56.7 +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))}
    56.8  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)
    56.9  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)
   56.10  4 errors

    57.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Jul 26 16:48:41 2012 -0700
    57.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 02 18:22:41 2012 +0100
    57.3 @@ -1,2 +1,2 @@
    57.4 -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>>)
    57.5 +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>>))
    57.6  1 error

    58.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Jul 26 16:48:41 2012 -0700
    58.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 02 18:22:41 2012 +0100
    58.3 @@ -1,2 +1,2 @@
    58.4 -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)
    58.5 +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)
    58.6  1 error

    59.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Jul 26 16:48:41 2012 -0700
    59.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 02 18:22:41 2012 +0100
    59.3 @@ -1,2 +1,2 @@
    59.4 -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>)
    59.5 +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>))
    59.6  1 error

    60.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Jul 26 16:48:41 2012 -0700
    60.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 02 18:22:41 2012 +0100
    60.3 @@ -1,2 +1,2 @@
    60.4 -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)
    60.5 +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)
    60.6  1 error

    61.1 --- a/test/tools/javac/generics/inference/6650759/T6650759m.out	Thu Jul 26 16:48:41 2012 -0700
    61.2 +++ b/test/tools/javac/generics/inference/6650759/T6650759m.out	Thu Aug 02 18:22:41 2012 +0100
    61.3 @@ -1,2 +1,2 @@
    61.4 -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)
    61.5 +T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer, java.lang.String)
    61.6  1 error

    62.1 --- a/test/tools/javac/generics/inference/6838943/T6838943.out	Thu Jul 26 16:48:41 2012 -0700
    62.2 +++ b/test/tools/javac/generics/inference/6838943/T6838943.out	Thu Aug 02 18:22:41 2012 +0100
    62.3 @@ -1,2 +1,2 @@
    62.4 -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>)
    62.5 +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>))
    62.6  1 error

    63.1 --- a/test/tools/javac/generics/inference/7086586/T7086586.out	Thu Jul 26 16:48:41 2012 -0700
    63.2 +++ b/test/tools/javac/generics/inference/7086586/T7086586.out	Thu Aug 02 18:22:41 2012 +0100
    63.3 @@ -1,5 +1,5 @@
    63.4 -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>)
    63.5 -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>)
    63.6 -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>)
    63.7 -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>)
    63.8 +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>))
    63.9 +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>))
   63.10 +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>))
   63.11 +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>))
   63.12  4 errors

    64.1 --- a/test/tools/javac/generics/inference/7154127/T7154127.out	Thu Jul 26 16:48:41 2012 -0700
    64.2 +++ b/test/tools/javac/generics/inference/7154127/T7154127.out	Thu Aug 02 18:22:41 2012 +0100
    64.3 @@ -1,2 +1,2 @@
    64.4 -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>)
    64.5 +T7154127.java:19:49: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: Y, T7154127.D,T7154127.B<U>)
    64.6  1 error

    65.1 --- a/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out	Thu Jul 26 16:48:41 2012 -0700
    65.2 +++ b/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out	Thu Aug 02 18:22:41 2012 +0100
    65.3 @@ -1,2 +1,2 @@
    65.4 -T7062745neg.java:16:36: compiler.err.prob.found.req: java.lang.Object, java.lang.Number
    65.5 +T7062745neg.java:16:36: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.Number)
    65.6  1 error

    66.1 --- a/test/tools/javac/generics/wildcards/6886247/T6886247_2.out	Thu Jul 26 16:48:41 2012 -0700
    66.2 +++ b/test/tools/javac/generics/wildcards/6886247/T6886247_2.out	Thu Aug 02 18:22:41 2012 +0100
    66.3 @@ -1,2 +1,2 @@
    66.4 -T6886247_2.java:35:28: compiler.err.prob.found.req: compiler.misc.type.captureof: 1, ?, E
    66.5 +T6886247_2.java:35:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: compiler.misc.type.captureof: 1, ?, E)
    66.6  1 error

    67.1 --- a/test/tools/javac/multicatch/Neg06.out	Thu Jul 26 16:48:41 2012 -0700
    67.2 +++ b/test/tools/javac/multicatch/Neg06.out	Thu Aug 02 18:22:41 2012 +0100
    67.3 @@ -1,3 +1,3 @@
    67.4 -Neg06.java:14:16: compiler.err.prob.found.req: java.lang.String, java.lang.Throwable
    67.5 -Neg06.java:14:25: compiler.err.prob.found.req: java.lang.Integer, java.lang.Throwable
    67.6 +Neg06.java:14:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Throwable)
    67.7 +Neg06.java:14:25: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Integer, java.lang.Throwable)
    67.8  2 errors

    68.1 --- a/test/tools/javac/multicatch/Neg07.out	Thu Jul 26 16:48:41 2012 -0700
    68.2 +++ b/test/tools/javac/multicatch/Neg07.out	Thu Aug 02 18:22:41 2012 +0100
    68.3 @@ -1,2 +1,2 @@
    68.4 -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>
    68.5 +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>)
    68.6  1 error

    69.1 --- a/test/tools/javac/types/CastObjectToPrimitiveTest.out	Thu Jul 26 16:48:41 2012 -0700
    69.2 +++ b/test/tools/javac/types/CastObjectToPrimitiveTest.out	Thu Aug 02 18:22:41 2012 +0100
    69.3 @@ -1,2 +1,2 @@
    69.4 -CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req.1: (compiler.misc.inconvertible.types: java.lang.Object, int)
    69.5 +CastObjectToPrimitiveTest.java:36:23: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, int)
    69.6  1 error

    70.1 --- a/test/tools/javac/varargs/6313164/T6313164.out	Thu Jul 26 16:48:41 2012 -0700
    70.2 +++ b/test/tools/javac/varargs/6313164/T6313164.out	Thu Aug 02 18:22:41 2012 +0100
    70.3 @@ -1,6 +1,6 @@
    70.4  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)
    70.5 -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)
    70.6 -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)
    70.7 +T6313164.java:14:13: compiler.err.prob.found.req: (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
    70.8 +T6313164.java:15:13: compiler.err.prob.found.req: (compiler.misc.inaccessible.varargs.type: p1.A, kindname.class, T6313164)
    70.9  - compiler.note.unchecked.filename: B.java
   70.10  - compiler.note.unchecked.recompile
   70.11  3 errors

    71.1 --- a/test/tools/javac/varargs/7097436/T7097436.out	Thu Jul 26 16:48:41 2012 -0700
    71.2 +++ b/test/tools/javac/varargs/7097436/T7097436.out	Thu Aug 02 18:22:41 2012 +0100
    71.3 @@ -1,6 +1,6 @@
    71.4  T7097436.java:13:20: compiler.warn.varargs.unsafe.use.varargs.param: ls
    71.5  T7097436.java:14:25: compiler.warn.varargs.unsafe.use.varargs.param: ls
    71.6 -T7097436.java:15:20: compiler.err.prob.found.req: java.util.List<java.lang.String>[], java.lang.String
    71.7 -T7097436.java:16:26: compiler.err.prob.found.req: java.util.List<java.lang.String>[], java.lang.Integer[]
    71.8 +T7097436.java:15:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>[], java.lang.String)
    71.9 +T7097436.java:16:26: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>[], java.lang.Integer[])
   71.10  2 errors
   71.11  2 warnings