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

changeset 2386
f8e84de96252
parent 2166
31fe30e2deac
child 2525
2eb010b6cb22
     1.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Fri May 09 19:42:25 2014 -0600
     1.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Fri May 09 09:36:35 2014 +0200
     1.3 @@ -35,9 +35,6 @@
     1.4  import java.util.Queue;
     1.5  import java.util.ResourceBundle;
     1.6  import java.util.Set;
     1.7 -import java.util.logging.Handler;
     1.8 -import java.util.logging.Level;
     1.9 -import java.util.logging.Logger;
    1.10  
    1.11  import javax.annotation.processing.Processor;
    1.12  import javax.lang.model.SourceVersion;
    1.13 @@ -1304,11 +1301,16 @@
    1.14       * Perform dataflow checks on an attributed parse tree.
    1.15       */
    1.16      protected void flow(Env<AttrContext> env, Queue<Env<AttrContext>> results) {
    1.17 +        if (compileStates.isDone(env, CompileState.FLOW)) {
    1.18 +            results.add(env);
    1.19 +            return;
    1.20 +        }
    1.21 +
    1.22          try {
    1.23              if (shouldStop(CompileState.FLOW))
    1.24                  return;
    1.25  
    1.26 -            if (relax || compileStates.isDone(env, CompileState.FLOW)) {
    1.27 +            if (relax) {
    1.28                  results.add(env);
    1.29                  return;
    1.30              }

mercurial