1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Tue Feb 05 21:55:41 2013 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Feb 06 14:03:39 2013 +0000
1.3 @@ -35,7 +35,7 @@
1.4 import com.sun.tools.javac.comp.DeferredAttr.DeferredAttrContext;
1.5 import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
1.6 import com.sun.tools.javac.comp.Infer.InferenceContext;
1.7 -import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
1.8 +import com.sun.tools.javac.comp.Infer.FreeTypeListener;
1.9 import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
1.10 import com.sun.tools.javac.jvm.*;
1.11 import com.sun.tools.javac.tree.*;
1.12 @@ -741,7 +741,7 @@
1.13 inferenceContext.addFreeTypeListener(List.of(t), new FreeTypeListener() {
1.14 @Override
1.15 public void typesInferred(InferenceContext inferenceContext) {
1.16 - varargsAccessible(env, inferenceContext.asInstType(t, types), inferenceContext);
1.17 + varargsAccessible(env, inferenceContext.asInstType(t), inferenceContext);
1.18 }
1.19 });
1.20 } else {
1.21 @@ -785,8 +785,8 @@
1.22
1.23 public boolean compatible(Type found, Type req, Warner warn) {
1.24 return strict ?
1.25 - types.isSubtypeUnchecked(found, deferredAttrContext.inferenceContext.asFree(req, types), warn) :
1.26 - types.isConvertible(found, deferredAttrContext.inferenceContext.asFree(req, types), warn);
1.27 + types.isSubtypeUnchecked(found, deferredAttrContext.inferenceContext.asFree(req), warn) :
1.28 + types.isConvertible(found, deferredAttrContext.inferenceContext.asFree(req), warn);
1.29 }
1.30
1.31 public void report(DiagnosticPosition pos, JCDiagnostic details) {
