Add export dependencies to Kernel libraries and use them to resynthesize ExportElement(s) in Analyz…

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

Index: pkg/front_end/lib/src/fasta/source/source_library_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index 119684a9c53d427dd48a7a65a4c93360d6a3d791..207866f015ea3ed20772027ce1041403b57b6f0c 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -68,6 +68,8 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
 
   final List<Import> imports = <Import>[];
 
+  final List<Export> exports = <Export>[];
+
   final Scope importScope;
 
   final Uri fileUri;
@@ -154,6 +156,11 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
     loader
         .read(resolve(uri), charOffset, accessor: this)
         .addExporter(this, combinators, charOffset);
+    exports.add(new Export(
+        this,
+        loader.read(resolve(uri), charOffset, accessor: this),

[Siggi Cherem (dart-lang), 2017/07/26 19:22:42]

rather than rereading it here, store it in a local variable instead.

LibraryBuilder exportedLibrary = loader.read(...);
exportedLibrary.addExporter(this, combinators, charOffset);
exports.add(new Export(this, exportedLibrary, combinators, charset));

[scheglov, 2017/07/26 19:33:04]

Done.

+        combinators,
+        charOffset));
   }
 
   void addImport(
@@ -337,7 +344,7 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
             fileUri);
       }
       return existing
-        ..exports.merge(builder.exports,
+        ..exportScope.merge(builder.exportScope,
             (String name, Builder existing, Builder member) {
           return buildAmbiguousBuilder(name, existing, member, charOffset);
         });
@@ -498,7 +505,7 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
       import.finalizeImports(this);
     }
     if (!explicitCoreImport) {
-      loader.coreLibrary.exports.forEach((String name, Builder member) {
+      loader.coreLibrary.exportScope.forEach((String name, Builder member) {
         addToScope(name, member, -1, true);
       });
     }