1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Aug 12 17:25:07 2013 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Aug 12 17:28:31 2013 +0100
1.3 @@ -2395,7 +2395,7 @@
1.4
1.5 ResultInfo bodyResultInfo = lambdaType.getReturnType() == Type.recoveryType ?
1.6 recoveryInfo :
1.7 - new LambdaResultInfo(lambdaType.getReturnType(), funcContext);
1.8 + new ResultInfo(VAL, lambdaType.getReturnType(), funcContext);
1.9 localEnv.info.returnResult = bodyResultInfo;
1.10
1.11 Log.DeferredDiagnosticHandler lambdaDeferredHandler = new Log.DeferredDiagnosticHandler(log);
1.12 @@ -2602,28 +2602,6 @@
1.13 }
1.14 }
1.15
1.16 - class LambdaResultInfo extends ResultInfo {
1.17 -
1.18 - LambdaResultInfo(Type pt, CheckContext checkContext) {
1.19 - super(VAL, pt, checkContext);
1.20 - }
1.21 -
1.22 - @Override
1.23 - protected Type check(DiagnosticPosition pos, Type found) {
1.24 - return super.check(pos, found.baseType());
1.25 - }
1.26 -
1.27 - @Override
1.28 - protected ResultInfo dup(CheckContext newContext) {
1.29 - return new LambdaResultInfo(pt, newContext);
1.30 - }
1.31 -
1.32 - @Override
1.33 - protected ResultInfo dup(Type newPt) {
1.34 - return new LambdaResultInfo(newPt, checkContext);
1.35 - }
1.36 - }
1.37 -
1.38 /**
1.39 * Lambda compatibility. Check that given return types, thrown types, parameter types
1.40 * are compatible with the expected functional interface descriptor. This means that:
