commit d1a88e0b7a3ee1d8caf239d3e6dd826cb5da5f39
author Maurizio Cimadamore <maurizio.cimadamore@oracle.com> Tue Jun 18 18:57:52 2013 +0100
committer Vicente Romero <vromero@openjdk.org> Tue Jun 18 18:57:52 2013 +0100
tree abac38582cd1b2846ce5226d7da9852afd692006
parent 1839512a15af5a646025dff16ba9e3a1ad7314ec

8016607: javac, avoid analyzing lambdas for source 7 compilation

Reviewed-by: jjg

langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java

diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 291a341..0c20e77 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1435,11 +1435,13 @@
             env.tree = transTypes.translateTopLevelClass(env.tree, localMake);
             compileStates.put(env, CompileState.TRANSTYPES);
 
-            if (shouldStop(CompileState.UNLAMBDA))
-                return;
+            if (source.allowLambda()) {
+                if (shouldStop(CompileState.UNLAMBDA))
+                    return;
 
-            env.tree = lambdaToMethod.translateTopLevelClass(env, env.tree, localMake);
-            compileStates.put(env, CompileState.UNLAMBDA);
+                env.tree = lambdaToMethod.translateTopLevelClass(env, env.tree, localMake);
+                compileStates.put(env, CompileState.UNLAMBDA);
+            }
 
             if (shouldStop(CompileState.LOWER))
                 return;