Refactor enqueuers

pkg/dart2js_incremental/lib/caching_compiler.dart

 // Copyright (c) 2013, 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.
 
 part of dart2js_incremental;
 
 /// Do not call this method directly. It will be made private.
 // TODO(ahe): Make this method private.
 Future<CompilerImpl> reuseCompiler(
     {CompilerDiagnostics diagnosticHandler,
@@ skipping 17 matching lines @@
   if (diagnosticHandler == null) {
     throw 'Missing diagnosticHandler';
   }
   if (outputProvider == null) {
     outputProvider = const NullCompilerOutput();
   }
   if (environment == null) {
     environment = {};
   }
   CompilerImpl compiler = cachedCompiler;
+  JavaScriptBackend backend = compiler?.backend;
   if (compiler == null ||
       compiler.libraryRoot != libraryRoot ||
       !compiler.options.hasIncrementalSupport ||
       compiler.hasCrashed ||
-      compiler.enqueuer.resolution.hasEnqueuedReflectiveElements ||
+      backend.mirrorsAnalysis.resolutionHandler.hasEnqueuedReflectiveElements ||
       compiler.deferredLoadTask.isProgramSplit) {
     if (compiler != null && compiler.options.hasIncrementalSupport) {
       print('***FLUSH***');
       if (compiler.hasCrashed) {
         print('Unable to reuse compiler due to crash.');
-      } else if (compiler.enqueuer.resolution.hasEnqueuedReflectiveElements) {
+      } else if (backend.mirrorsAnalysis.resolutionHandler
+                     .hasEnqueuedReflectiveElements) {
         print('Unable to reuse compiler due to dart:mirrors.');
       } else if (compiler.deferredLoadTask.isProgramSplit) {
         print('Unable to reuse compiler due to deferred loading.');
       } else {
         print('Unable to reuse compiler.');
       }
     }
     oldTag.makeCurrent();
     compiler = new CompilerImpl(
         inputProvider,
         outputProvider,
         diagnosticHandler,
         new CompilerOptions.parse(
             libraryRoot: libraryRoot,
             packageRoot: packageRoot,
             packageConfig: packageConfig,
             options: options,
             environment: environment));
-    JavaScriptBackend backend = compiler.backend;
+    backend = compiler.backend;
 
     full.Emitter emitter = backend.emitter.emitter;
 
     // Much like a scout, an incremental compiler is always prepared. For
     // mixins, classes, and lazy statics, at least.
     emitter
         ..needsClassSupport = true
         ..needsMixinSupport = true
         ..needsLazyInitializer = true
         ..needsStructuredMemberInfo = true;
 
     Uri core = Uri.parse("dart:core");
 
     return compiler.setupSdk().then((_) {
       return compiler.libraryLoader.loadLibrary(core).then((_) {
         // Likewise, always be prepared for runtimeType support.
         // TODO(johnniwinther): Add global switch to force RTI.
         compiler.enabledRuntimeType = true;
-        backend.registerRuntimeType(
-            compiler.enqueuer.resolution, compiler.globalDependencies);
+        backend.registerRuntimeType(compiler.enqueuer.resolution);
         return compiler;
       });
     });
   } else {
     compiler.tasks.forEach((t) => t.clearMeasurements());
     compiler
         ..userOutputProvider = outputProvider
         ..provider = inputProvider
         ..handler = diagnosticHandler
         ..enqueuer.resolution.queueIsClosed = false
@@ skipping 91 matching lines @@
   final Map<String, String> output = new Map<String, String>();
 
   EventSink<String> createEventSink(String name, String extension) {
     return new StringEventSink((String data) {
       output['$name.$extension'] = data;
     });
   }
 
   String operator[] (String key) => output[key];
 }