Make CompilerTask independent of compiler.

pkg/compiler/lib/src/enqueue.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.
 
 library dart2js.enqueue;
 
 import 'dart:collection' show Queue;
 
 import 'common/codegen.dart' show CodegenWorkItem;
 import 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show Resolution;
 import 'common/resolution.dart' show ResolutionWorkItem;
-import 'common/tasks.dart' show CompilerTask, DeferredAction, DeferredTask;
+import 'common/tasks.dart' show CompilerTask;
 import 'common/work.dart' show ItemCompilationContext, WorkItem;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'dart_types.dart' show DartType, InterfaceType;
 import 'elements/elements.dart'
     show
         AnalyzableElement,
         AstElement,
         ClassElement,
         ConstructorElement,
@@ skipping 15 matching lines @@
     show DynamicUse, StaticUse, StaticUseKind, TypeUse, TypeUseKind;
 import 'universe/world_impact.dart'
     show ImpactUseCase, WorldImpact, WorldImpactVisitor;
 import 'util/util.dart' show Setlet;
 
 typedef ItemCompilationContext ItemCompilationContextCreator();
 
 class EnqueueTask extends CompilerTask {
   final ResolutionEnqueuer resolution;
   final CodegenEnqueuer codegen;
+  final Compiler compiler;
 
   String get name => 'Enqueue';
 
   EnqueueTask(Compiler compiler)
-      : resolution = new ResolutionEnqueuer(
+      : compiler = compiler,
+        resolution = new ResolutionEnqueuer(
             compiler,
             compiler.backend.createItemCompilationContext,
             compiler.options.analyzeOnly && compiler.options.analyzeMain
                 ? const EnqueuerStrategy()
                 : const TreeShakingEnqueuerStrategy()),
         codegen = new CodegenEnqueuer(
             compiler,
             compiler.backend.createItemCompilationContext,
             const TreeShakingEnqueuerStrategy()),
-        super(compiler) {
+        super(compiler.measurer) {
     codegen.task = this;
     resolution.task = this;
 
     codegen.nativeEnqueuer = compiler.backend.nativeCodegenEnqueuer(codegen);
     resolution.nativeEnqueuer =
         compiler.backend.nativeResolutionEnqueuer(resolution);
   }
 
   void forgetElement(Element element) {
     resolution.forgetElement(element);
@@ skipping 633 matching lines @@
   }
 }
 
 /// [Enqueuer] which is specific to resolution.
 class ResolutionEnqueuer extends Enqueuer {
   /// All declaration elements that have been processed by the resolver.
   final Set<AstElement> processedElements;
 
   final Queue<ResolutionWorkItem> queue;
 
-  /**
-   * A deferred task queue for the resolution phase which is processed
-   * when the resolution queue has been emptied.
-   */
-  final Queue<DeferredTask> deferredTaskQueue;
+  /// Queue of deferred resolution actions to execute when the resolution queue
+  /// has been emptied.
+  final Queue<_DeferredAction> deferredQueue;
 
   static const ImpactUseCase IMPACT_USE =
       const ImpactUseCase('ResolutionEnqueuer');
 
   ImpactUseCase get impactUse => IMPACT_USE;
 
   ResolutionEnqueuer(
       Compiler compiler,
       ItemCompilationContext itemCompilationContextCreator(),
       EnqueuerStrategy strategy)
       : super('resolution enqueuer', compiler, itemCompilationContextCreator,
             strategy),
         processedElements = new Set<AstElement>(),
         queue = new Queue<ResolutionWorkItem>(),
-        deferredTaskQueue = new Queue<DeferredTask>();
+        deferredQueue = new Queue<_DeferredAction>();
 
   bool get isResolutionQueue => true;
 
   bool isProcessed(Element member) => processedElements.contains(member);
 
   /// Returns `true` if [element] has been processed by the resolution enqueuer.
   bool hasBeenProcessed(Element element) {
     return processedElements.contains(element.analyzableElement.declaration);
   }
 
@@ skipping 77 matching lines @@
   }
 
   /**
    * Adds an action to the deferred task queue.
    *
    * The action is performed the next time the resolution queue has been
    * emptied.
    *
    * The queue is processed in FIFO order.
    */
-  void addDeferredAction(Element element, DeferredAction action) {
+  void addDeferredAction(Element element, void action()) {
     if (queueIsClosed) {
       throw new SpannableAssertionFailure(
           element,
           "Resolution work list is closed. "
           "Trying to add deferred action for $element");
     }
-    deferredTaskQueue.add(new DeferredTask(element, action));
+    deferredQueue.add(new _DeferredAction(element, action));
   }
 
   bool onQueueEmpty(Iterable<ClassElement> recentClasses) {
-    emptyDeferredTaskQueue();
+    _emptyDeferredQueue();
     return super.onQueueEmpty(recentClasses);
   }
 
-  void emptyDeferredTaskQueue() {
-    while (!deferredTaskQueue.isEmpty) {
-      DeferredTask task = deferredTaskQueue.removeFirst();
+  void emptyDeferredQueueForTesting() => _emptyDeferredQueue();
+
+  void _emptyDeferredQueue() {
+    while (!deferredQueue.isEmpty) {
+      _DeferredAction task = deferredQueue.removeFirst();
       reporter.withCurrentElement(task.element, task.action);
     }
   }
 
   void _logSpecificSummary(log(message)) {
     log('Resolved ${processedElements.length} elements.');
   }
 
   void forgetElement(Element element) {
     super.forgetElement(element);
@@ skipping 175 matching lines @@
   @override
   void visitStaticUse(StaticUse staticUse) {
     enqueuer.registerStaticUse(staticUse);
   }
 
   @override
   void visitTypeUse(TypeUse typeUse) {
     enqueuer.registerTypeUse(typeUse);
   }
 }
+
+typedef void _DeferredActionFunction();
+
+class _DeferredAction {
+  final Element element;
+  final _DeferredActionFunction action;
+
+  _DeferredAction(this.element, this.action);
+}