1.1 --- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Tue Feb 05 21:55:41 2013 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Wed Feb 06 14:03:39 2013 +0000
1.3 @@ -373,8 +373,8 @@
1.4 if (!progress) {
1.5 //remove all variables that have already been instantiated
1.6 //from the list of stuck variables
1.7 - inferenceContext.solveAny(inferenceContext.freeVarsIn(List.from(stuckVars)), types, infer);
1.8 - inferenceContext.notifyChange(types);
1.9 + inferenceContext.solveAny(inferenceContext.freeVarsIn(List.from(stuckVars)));
1.10 + inferenceContext.notifyChange();
1.11 }
1.12 }
1.13 }
1.14 @@ -383,7 +383,7 @@
1.15 * Class representing a deferred attribution node. It keeps track of
1.16 * a deferred type, along with the expected target type information.
1.17 */
1.18 - class DeferredAttrNode implements Infer.InferenceContext.FreeTypeListener {
1.19 + class DeferredAttrNode implements Infer.FreeTypeListener {
1.20
1.21 /** underlying deferred type */
1.22 DeferredType dt;
1.23 @@ -406,7 +406,7 @@
1.24 @Override
1.25 public void typesInferred(InferenceContext inferenceContext) {
1.26 stuckVars = List.nil();
1.27 - resultInfo = resultInfo.dup(inferenceContext.asInstType(resultInfo.pt, types));
1.28 + resultInfo = resultInfo.dup(inferenceContext.asInstType(resultInfo.pt));
1.29 }
1.30
1.31 /**
