Some cleanup of recompilation

lib/compiler/implementation/compiler.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 final bool REPORT_EXCESS_RESOLUTION = false;
@@ skipping 151 matching lines @@
   ScannerTask scanner;
   DietParserTask dietParser;
   ParserTask parser;
   TreeValidatorTask validator;
   UnparseValidator unparseValidator;
   ResolverTask resolver;
   TypeCheckerTask checker;
   Backend backend;
   ConstantHandler constantHandler;
   EnqueueTask enqueuer;
-  int pass = 1;
 
   static final SourceString MAIN = const SourceString('main');
   static final SourceString NO_SUCH_METHOD = const SourceString('noSuchMethod');
   static final SourceString NO_SUCH_METHOD_EXCEPTION =
       const SourceString('NoSuchMethodException');
   static final SourceString START_ROOT_ISOLATE =
       const SourceString('startRootIsolate');
   bool enabledNoSuchMethod = false;
 
-  Stopwatch codegenProgress;
+  Stopwatch progress;
+
+  static final int PHASE_RESOLVING = 0;
+  static final int PHASE_COMPILING = 1;
+  static final int PHASE_RECOMPILING = 2;
+  int phase;

[ahe, 2012/06/15 14:33:16]

I agree, this field is a compiler.phase. Perhaps we should add one more phase:

SCANNING, RESOLVING, COMPILING, RECOMPILING.

[Søren Gjesse, 2012/06/18 06:40:36]

Added scanning.

 
   Compiler([this.tracer = const Tracer(),
             this.enableTypeAssertions = false,
             this.enableUserAssertions = false,
             bool emitJavascript = true,
             validateUnparse = false])
       : libraries = new Map<String, LibraryElement>(),
         world = new World(),
-        codegenProgress = new Stopwatch.start() {
+        progress = new Stopwatch.start() {
     namer = new Namer(this);
     constantHandler = new ConstantHandler(this);
     scanner = new ScannerTask(this);
     dietParser = new DietParserTask(this);
     parser = new ParserTask(this);
     validator = new TreeValidatorTask(this);
     unparseValidator = new UnparseValidator(this, validateUnparse);
     resolver = new ResolverTask(this);
     checker = new TypeCheckerTask(this);
     backend = emitJavascript ?
@@ skipping 212 matching lines @@
       parameters.forEachParameter((Element parameter) {
         reportFatalError('main cannot have parameters', parameter);
       });
     }
 
     // TODO(ahe): Remove this line. Eventually, enqueuer.resolution
     // should know this.
     world.populate(this, libraries.getValues());
 
     log('Resolving...');
+    phase = PHASE_RESOLVING;
     backend.enqueueHelpers(enqueuer.resolution);
     processQueue(enqueuer.resolution, main);
     log('Resolved ${enqueuer.resolution.resolvedElements.length} elements.');
 
     log('Compiling...');
+    phase = PHASE_COMPILING;
     processQueue(enqueuer.codegen, main);
     log("Recompiling ${enqueuer.codegen.recompilationCandidates.length} "
         "methods...");
+    phase = PHASE_RECOMPILING;
     processRecompilationQueue(enqueuer.codegen);
     log('Compiled ${codegenWorld.generatedCode.length} methods.');
 
     backend.assembleProgram();
 
     checkQueues();
   }
 
   processQueue(Enqueuer world, Element main) {
     backend.processNativeClasses(world, libraries.getValues());
     world.addToWorkList(main);
-    codegenProgress.reset();
+    progress.reset();
     world.forEach((WorkItem work) {
       withCurrentElement(work.element, () => work.run(this, world));
     });
     world.queueIsClosed = true;
     assert(world.checkNoEnqueuedInvokedInstanceMethods());
     world.registerFieldClosureInvocations();
   }
 
   processRecompilationQueue(Enqueuer world) {
-    pass = 2;
+    assert(phase == PHASE_RECOMPILING);
     while (!world.recompilationCandidates.isEmpty()) {
       WorkItem work = world.recompilationCandidates.next();
+      world.universe.generatedCode.remove(work.element);
       var oldCode = world.universe.generatedCode[work.element];
-      world.universe.generatedCode.remove(work.element);
       withCurrentElement(work.element, () => work.run(this, world));
       var newCode = world.universe.generatedCode[work.element];
       if (REPORT_PASS2_OPTIMIZATIONS && newCode != oldCode) {
         log("Pass 2 optimization:");
         log("Before:\n$oldCode");
         log("After:\n$newCode");
       }
     }
   }
 
@@ skipping 58 matching lines @@
     Node tree = parser.parse(element);
     validator.validate(tree);
     unparseValidator.check(element);
     elements = resolver.resolve(element);
     checker.check(tree, elements);
     return elements;
   }
 
   TreeElements analyze(WorkItem work, Enqueuer world) {
     if (work.isAnalyzed()) return work.resolutionTree;
+    if (progress.elapsedInMs() > 500) {
+      // TODO(ahe): Add structured diagnostics to the compiler API and
+      // use it to separate this from the --verbose option.
+      if (phase == PHASE_RESOLVING) {
+        log('Resolved ${enqueuer.resolution.resolvedElements.length} elements.');

[ahe, 2012/06/15 14:33:16]

Nice, but the line is too long :-)

[Søren Gjesse, 2012/06/18 06:40:36]

Done.

+        progress.reset();
+      }
+    }
     Element element = work.element;
     TreeElements result = world.getCachedElements(element);
     if (result !== null) return result;
     if (world !== enqueuer.resolution) {
       internalErrorOnElement(element,
                              'Internal error: unresolved element: $element.');
     }
     result = analyzeElement(element);
     enqueuer.resolution.resolvedElements[element] = result;
     return result;
   }
 
   String codegen(WorkItem work, Enqueuer world) {
     if (world !== enqueuer.codegen) return null;
-    if (codegenProgress.elapsedInMs() > 500) {
+    if (progress.elapsedInMs() > 500) {
       // TODO(ahe): Add structured diagnostics to the compiler API and
       // use it to separate this from the --verbose option.
-      log('Compiled ${codegenWorld.generatedCode.length} methods.');
-      codegenProgress.reset();
+      if (phase == PHASE_COMPILING) {
+        log('Compiled ${codegenWorld.generatedCode.length} methods.');
+      } else {
+        log('Recompiled ${world.recompilationCandidates.processed} methods.');
+      }
+      progress.reset();
     }
     if (work.element.kind.category == ElementCategory.VARIABLE) {
       constantHandler.compileWorkItem(work);
       return null;
     } else {
       String code = backend.codegen(work);
       codegenWorld.addGeneratedCode(work, code);
       return code;
     }
   }
@@ skipping 173 matching lines @@
     // invariant that endOffset > beginOffset, but for EOF the
     // charoffset of the next token may be [beginOffset]. This can
     // also happen for synthetized tokens that are produced during
     // error handling.
     final endOffset =
       Math.max((end.next !== null) ? end.next.charOffset : 0, beginOffset + 1);
     assert(endOffset > beginOffset);
     return f(beginOffset, endOffset);
   }
 }