--- a/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Fri Sep 20 16:33:35 2013 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java Sun Sep 22 12:53:03 2013 +0100
@@ -153,6 +153,8 @@
return instance;
}
+ private Attr attr;
+
private LambdaToMethod(Context context) {
diags = JCDiagnostic.Factory.instance(context);
log = Log.instance(context);
@@ -166,6 +168,7 @@
analyzer = new LambdaAnalyzerPreprocessor();
Options options = Options.instance(context);
dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
+ attr = Attr.instance(context);
}
// </editor-fold>
@@ -368,6 +371,7 @@
case BOUND: /** Expr :: instMethod */
init = tree.getQualifierExpression();
+ init = attr.makeNullCheck(init);
break;
case UNBOUND: /** Type :: instMethod */