Create ResolutionEnqueuer after library loading.

pkg/compiler/lib/src/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.
 
 library dart2js.compiler_base;
 
 import 'dart:async' show EventSink, Future;
 
 import '../compiler_new.dart' as api;
 import 'closure.dart' as closureMapping show ClosureTask;
@@ skipping 21 matching lines @@
 import 'dump_info.dart' show DumpInfoTask;
 import 'elements/elements.dart';
 import 'elements/entities.dart';
 import 'elements/modelx.dart' show ErroneousElementX;
 import 'elements/resolution_types.dart'
     show
         ResolutionDartType,
         ResolutionDynamicType,
         ResolutionInterfaceType,
         Types;
-import 'enqueue.dart' show Enqueuer, EnqueueTask, ResolutionEnqueuer;
+import 'enqueue.dart'
+    show DeferredAction, Enqueuer, EnqueueTask, ResolutionEnqueuer;
 import 'environment.dart';
 import 'id_generator.dart';
 import 'io/source_information.dart' show SourceInformation;
 import 'js_backend/backend.dart' show JavaScriptBackend;
 import 'library_loader.dart'
     show
         ElementScanner,
         LibraryLoader,
         LibraryLoaderTask,
         LoadedLibraries,
@@ skipping 515 matching lines @@
   /// This operation assumes an unclosed resolution queue and is only supported
   /// when the '--analyze-main' option is used.
   Future<LibraryElement> analyzeUri(Uri libraryUri,
       {bool skipLibraryWithPartOfTag: true}) {
     assert(options.analyzeMain);
     reporter.log('Analyzing $libraryUri (${options.buildId})');
     return libraryLoader
         .loadLibrary(libraryUri, skipFileWithPartOfTag: true)
         .then((LibraryElement library) {
       if (library == null) return null;
-      enqueuer.resolution.applyImpact(computeImpactForLibrary(library));
-      emptyQueue(enqueuer.resolution, onProgress: showResolutionProgress);
-      enqueuer.resolution.logSummary(reporter.log);
+      ResolutionEnqueuer resolutionEnqueuer = startResolution();
+      resolutionEnqueuer.applyImpact(computeImpactForLibrary(library));
+      emptyQueue(resolutionEnqueuer, onProgress: showResolutionProgress);
+      resolutionEnqueuer.logSummary(reporter.log);
       return library;
     });
   }
 
+  /// Starts the resolution phase, creating the [ResolutionEnqueuer] if not
+  /// already created.

[Siggi Cherem (dart-lang), 2017/03/14 05:27:55]

why would it be created before? or is that only in --analyze-all mode? Maybe say
or assert that if that's the reason?

[Johnni Winther, 2017/03/15 12:46:53]

Due to [analyzeUri]. Added to the comment.

+  ResolutionEnqueuer startResolution() {
+    ResolutionEnqueuer resolutionEnqueuer;
+    if (enqueuer.hasResolution) {
+      resolutionEnqueuer = enqueuer.resolution;
+    } else {
+      resolutionEnqueuer = enqueuer.createResolutionEnqueuer();
+      backend.onResolutionStart(resolutionEnqueuer);
+    }
+    resolutionEnqueuer.addDeferredActions(libraryLoader.pullDeferredActions());
+    return resolutionEnqueuer;
+  }
+
   /// Performs the compilation when all libraries have been loaded.
   void compileLoadedLibraries() =>
       selfTask.measureSubtask("Compiler.compileLoadedLibraries", () {
-        Enqueuer resolutionEnqueuer = enqueuer.createResolutionEnqueuer();
+        ResolutionEnqueuer resolutionEnqueuer = startResolution();
         WorldImpact mainImpact = computeMain();
 
         mirrorUsageAnalyzerTask.analyzeUsage(mainApp);
 
         // In order to see if a library is deferred, we must compute the
         // compile-time constants that are metadata.  This means adding
         // something to the resolution queue.  So we cannot wait with
         // this until after the resolution queue is processed.
         deferredLoadTask.beforeResolution(this);
         impactStrategy = backend.createImpactStrategy(
@@ skipping 1444 matching lines @@
     if (library != null && library.isSynthesized) {
       return null;
     }
     if (library == null && required) {
       throw new SpannableAssertionFailure(
           library, "The library '${uri}' was not found.");
     }
     return library;
   }
 }