--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Feb 06 14:03:39 2013 +0000
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Feb 06 14:04:43 2013 +0000
@@ -564,7 +564,7 @@
methodCheck,
warn);
- methodCheck.argumentsAcceptable(env, currentResolutionContext.deferredAttrContext(m, infer.emptyContext),
+ methodCheck.argumentsAcceptable(env, currentResolutionContext.deferredAttrContext(m, infer.emptyContext, resultInfo, warn),
argtypes, mt.getParameterTypes(), warn);
return mt;
}
@@ -3589,8 +3589,8 @@
candidates = candidates.append(c);
}
- DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext) {
- return deferredAttr.new DeferredAttrContext(attrMode, sym, step, inferenceContext);
+ DeferredAttrContext deferredAttrContext(Symbol sym, InferenceContext inferenceContext, ResultInfo pendingResult, Warner warn) {
+ return deferredAttr.new DeferredAttrContext(attrMode, sym, step, inferenceContext, pendingResult != null ? pendingResult.checkContext.deferredAttrContext() : deferredAttr.emptyDeferredAttrContext, warn);
}
/**