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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Mar 08 08:19:58 2012 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Fri Mar 09 17:10:56 2012 +0000
     1.3 @@ -385,7 +385,6 @@
     1.4                                    final Warner warn) throws InferenceException {
     1.5          //-System.err.println("instantiateMethod(" + tvars + ", " + mt + ", " + argtypes + ")"); //DEBUG
     1.6          List<Type> undetvars = Type.map(tvars, fromTypeVarFun);
     1.7 -        //final List<Type> capturedArgs = types.capture(argtypes);
     1.8  
     1.9          final List<Type> capturedArgs =
    1.10                  rs.checkRawArgumentsAcceptable(env, undetvars, argtypes, mt.getParameterTypes(),
    1.11 @@ -451,11 +450,12 @@
    1.12                                         types.subst(getThrownTypes(), tvars, inferred),
    1.13                                         qtype.tsym);
    1.14                      // check that actuals conform to inferred formals
    1.15 +                    warn.clear();
    1.16                      checkArgumentsAcceptable(env, capturedArgs, owntype.getParameterTypes(), allowBoxing, useVarargs, warn);
    1.17                      // check that inferred bounds conform to their bounds
    1.18                      checkWithinBounds(all_tvars,
    1.19                             types.subst(inferredTypes, tvars, inferred), warn);
    1.20 -                    qtype = chk.checkMethod(owntype, msym, env, TreeInfo.args(env.tree), capturedArgs, useVarargs);
    1.21 +                    qtype = chk.checkMethod(owntype, msym, env, TreeInfo.args(env.tree), capturedArgs, useVarargs, warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED));
    1.22                  }
    1.23              };
    1.24          }