infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-02 22:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

8026936: Initialize LamdbaToMethod lazily and as required

Browse Source 
Reviewed-by: jjg, rfield
This commit is contained in:
Jan Lahoda 2013-10-23 15:45:18 -07:00 committed by Kumar Srinivasan
parent 14fe29f845
commit 017ea08922
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,10 +271,6 @@ public class JavaCompiler {
*/
protected TransTypes transTypes;
/** The lambda translator.
*/
protected LambdaToMethod lambdaToMethod;
/** The syntactic sugar desweetener.
*/
protected Lower lower;
@ -388,8 +384,6 @@ public class JavaCompiler {
options = Options.instance(context);
lambdaToMethod = LambdaToMethod.instance(context);
verbose = options.isSet(VERBOSE);
sourceOutput = options.isSet(PRINTSOURCE); // used to be -s
stubOutput = options.isSet("-stubs");
@ -1393,6 +1387,7 @@ public class JavaCompiler {
*/
class ScanNested extends TreeScanner {
Set<Env<AttrContext>> dependencies = new LinkedHashSet<Env<AttrContext>>();
protected boolean hasLambdas;
@Override
public void visitClassDef(JCClassDecl node) {
Type st = types.supertype(node.sym.type);
@ -1402,7 +1397,18 @@ public class JavaCompiler {
Env<AttrContext> stEnv = enter.getEnv(c);
if (stEnv != null && env != stEnv) {
if (dependencies.add(stEnv)) {
scan(stEnv.tree);
boolean prevHasLambdas = hasLambdas;
try {
scan(stEnv.tree);
} finally {
/*
* ignore any updates to hasLambdas made during
* the nested scan, this ensures an initalized
* LambdaToMethod is available only to those
* classes that contain lambdas
*/
hasLambdas = prevHasLambdas;
}
}
envForSuperTypeFound = true;
}
@ -1410,6 +1416,16 @@ public class JavaCompiler {
}
super.visitClassDef(node);
}
@Override
public void visitLambda(JCLambda tree) {
hasLambdas = true;
super.visitLambda(tree);
}
@Override
public void visitReference(JCMemberReference tree) {
hasLambdas = true;
super.visitReference(tree);
}
}
ScanNested scanner = new ScanNested();
scanner.scan(env.tree);
@ -1468,11 +1484,11 @@ public class JavaCompiler {
env.tree = transTypes.translateTopLevelClass(env.tree, localMake);
compileStates.put(env, CompileState.TRANSTYPES);
if (source.allowLambda()) {
if (source.allowLambda() && scanner.hasLambdas) {
if (shouldStop(CompileState.UNLAMBDA))
return;
env.tree = lambdaToMethod.translateTopLevelClass(env, env.tree, localMake);
env.tree = LambdaToMethod.instance(context).translateTopLevelClass(env, env.tree, localMake);
compileStates.put(env, CompileState.UNLAMBDA);
}