Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jul 26 16:48:41 2012 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Aug 02 18:22:41 2012 +0100
     1.3 @@ -382,14 +382,14 @@
     1.4              }
     1.5  
     1.6              public InapplicableMethodException arityMismatch() {
     1.7 -                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch");
     1.8 +                return unambiguousNoInstanceException.setMessage("infer.arg.length.mismatch", inferenceVars(undetvars));
     1.9              }
    1.10 -            public InapplicableMethodException argumentMismatch(boolean varargs, Type found, Type expected) {
    1.11 +            public InapplicableMethodException argumentMismatch(boolean varargs, JCDiagnostic details) {
    1.12                  String key = varargs ?
    1.13 -                    "infer.varargs.argument.mismatch" :
    1.14 -                    "infer.no.conforming.assignment.exists";
    1.15 +                        "infer.varargs.argument.mismatch" :
    1.16 +                        "infer.no.conforming.assignment.exists";
    1.17                  return unambiguousNoInstanceException.setMessage(key,
    1.18 -                        inferenceVars(undetvars), found, expected);
    1.19 +                        inferenceVars(undetvars), details);
    1.20              }
    1.21              public InapplicableMethodException inaccessibleVarargs(Symbol location, Type expected) {
    1.22                  return unambiguousNoInstanceException.setMessage("inaccessible.varargs.type",