Ensure library dependencies are seen by SourceLoader

Change-Id: I3fa2cbc386446172fbbb1150d351ff9282678b7a
Reviewed-on: https://dart-review.googlesource.com/35181
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Peter von der Ahé <[email protected]>

Author: peter-ahe-google

pkg/front_end/lib/src/external_state_snapshot.dart

@@ -4,15 +4,15 @@
 
 // TODO(ahe): Remove this file.
 
-import 'package:kernel/kernel.dart' show Library, LibraryDependency, Program;
+import 'package:kernel/kernel.dart' show Library, Program;
 
 /// Helper class to work around modifications in [kernel_generator_impl.dart].
 class ExternalStateSnapshot {
   final List<ExternalState> snapshots;
 
   ExternalStateSnapshot(Program program)
-      : snapshots = new List<ExternalState>.from(program.libraries.map((l) =>
-            new ExternalState(l, l.dependencies.toList(), l.isExternal)));
+      : snapshots = new List<ExternalState>.from(
+            program.libraries.map((l) => new ExternalState(l, l.isExternal)));
 
   void restore() {
     for (ExternalState state in snapshots) {
@@ -23,15 +23,11 @@ class ExternalStateSnapshot {
 
 class ExternalState {
   final Library library;
-  final List<LibraryDependency> dependencies;
   final bool isExternal;
 
-  ExternalState(this.library, this.dependencies, this.isExternal);
+  ExternalState(this.library, this.isExternal);
 
   void restore() {
     library.isExternal = isExternal;
-    library.dependencies
-      ..clear()
-      ..addAll(dependencies);
   }
 }

pkg/front_end/lib/src/fasta/source/source_loader.dart

@@ -11,7 +11,8 @@ import 'dart:typed_data' show Uint8List;
 import 'package:front_end/src/fasta/type_inference/interface_resolver.dart'
     show InterfaceResolver;
 
-import 'package:kernel/ast.dart' show Arguments, Expression, Library, Program;
+import 'package:kernel/ast.dart'
+    show Arguments, Expression, Library, LibraryDependency, Program;
 
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 
@@ -541,17 +542,28 @@ class SourceLoader<L> extends Loader<L> {
   }
 
   Program computeFullProgram() {
-    List<Library> libraries = <Library>[];
+    Set<Library> libraries = new Set<Library>();
+    List<Library> workList = <Library>[];
     builders.forEach((Uri uri, LibraryBuilder library) {
       if (!library.isPart && !library.isPatch) {
-        libraries.add(library.target);
+        if (libraries.add(library.target)) {
+          workList.add(library.target);
+        }
       }
     });
+    while (workList.isNotEmpty) {
+      Library library = workList.removeLast();
+      for (LibraryDependency dependency in library.dependencies) {
+        if (libraries.add(dependency.targetLibrary)) {
+          workList.add(dependency.targetLibrary);
+        }
+      }
+    }
     return new Program()..libraries.addAll(libraries);
   }
 
   void computeHierarchy() {
-    hierarchy = new ClassHierarchy.deprecated_incremental(computeFullProgram());
+    hierarchy = new ClassHierarchy(computeFullProgram());
     ticker.logMs("Computed class hierarchy");
   }
 
@@ -634,8 +646,8 @@ class SourceLoader<L> extends Loader<L> {
     // target those forwarding stubs.
     // TODO(paulberry): could we make this unnecessary by not clearing class
     // inference info?
-    typeInferenceEngine.classHierarchy = hierarchy =
-        new ClassHierarchy.deprecated_incremental(computeFullProgram());
+    typeInferenceEngine.classHierarchy =
+        hierarchy = new ClassHierarchy(computeFullProgram());
     ticker.logMs("Performed top level inference");
   }
 

pkg/front_end/lib/src/kernel_generator_impl.dart

@@ -80,7 +80,6 @@ Future<CompilerResult> generateKernelInternal(
     dillTarget.loader.libraries.forEach((lib) {
       // TODO(ahe): Don't do this, and remove [external_state_snapshot.dart].
       lib.isExternal = true;
-      lib.dependencies.clear();
     });
 
     // Linked dependencies are meant to be part of the program so they are not

pkg/kernel/lib/binary/ast_from_binary.dart

@@ -656,10 +656,6 @@ class BinaryBuilder {
 
   void _readLibraryDependencies(Library library) {
     int length = readUInt();
-    if (library.isExternal) {
-      assert(length == 0);
-      return;
-    }
     library.dependencies.length = length;
     for (int i = 0; i < length; ++i) {
       library.dependencies[i] = readLibraryDependency(library);