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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jul 17 10:55:50 2014 -0400
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Fri Jun 20 20:36:54 2014 +0100
     1.3 @@ -531,8 +531,8 @@
     1.4  
     1.5      Type checkType(final DiagnosticPosition pos, final Type found, final Type req, final CheckContext checkContext) {
     1.6          final Infer.InferenceContext inferenceContext = checkContext.inferenceContext();
     1.7 -        if (inferenceContext.free(req)) {
     1.8 -            inferenceContext.addFreeTypeListener(List.of(req), new FreeTypeListener() {
     1.9 +        if (inferenceContext.free(req) || inferenceContext.free(found)) {
    1.10 +            inferenceContext.addFreeTypeListener(List.of(req, found), new FreeTypeListener() {
    1.11                  @Override
    1.12                  public void typesInferred(InferenceContext inferenceContext) {
    1.13                      checkType(pos, inferenceContext.asInstType(found), inferenceContext.asInstType(req), checkContext);