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

pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart

 // Copyright (c) 2016, 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 fasta.kernel_library_builder;
 
 import 'package:front_end/src/fasta/dill/dill_library_builder.dart';
+import 'package:front_end/src/fasta/export.dart';
 import 'package:front_end/src/fasta/import.dart';
 import 'package:kernel/ast.dart';
 
 import 'package:kernel/clone.dart' show CloneVisitor;
 
 import '../../scanner/token.dart' show Token;
 
 import '../fasta_codes.dart'
     show
         Message,
@@ skipping 706 matching lines @@
       if (importedBuilder is DillLibraryBuilder) {
         importedLibrary = importedBuilder.library;
       } else if (importedBuilder is KernelLibraryBuilder) {
         importedLibrary = importedBuilder.library;
       }
       if (importedLibrary != null) {
         library.addDependency(
             new LibraryDependency.import(importedLibrary, name: import.prefix));
       }
     }
+    for (Export import in exports) {
+      var exportedBuilder = import.exported;
+      Library exportedLibrary;
+      if (exportedBuilder is DillLibraryBuilder) {
+        exportedLibrary = exportedBuilder.library;
+      } else if (exportedBuilder is KernelLibraryBuilder) {
+        exportedLibrary = exportedBuilder.library;
+      }

[ahe, 2017/08/08 09:47:58]

I think it's possible to replace lines 735-742 with this:

Library exportedLibrary = import.exported.target;

For future reference: You can always access the corresponding kernel object from
a builder using `target`.

[scheglov, 2017/08/08 16:18:46]

OK, understood.
See https://codereview.chromium.org/2993283002 for the fix.

+      if (exportedLibrary != null) {
+        library.addDependency(new LibraryDependency.export(exportedLibrary));
+      }
+    }
     library.name = name;
     library.procedures.sort(compareProcedures);
     return library;
   }
 
   @override
   Builder buildAmbiguousBuilder(
       String name, Builder builder, Builder other, int charOffset,
       {bool isExport: false, bool isImport: false}) {
     // TODO(ahe): Can I move this to Scope or Prefix?
@@ skipping 43 matching lines @@
         addNit(template.withArguments(name, preferredUri, hiddenUri),
             charOffset, fileUri);
       }
       return preferred;
     }
     if (builder.next == null && other.next == null) {
       if (isImport && builder is PrefixBuilder && other is PrefixBuilder) {
         // Handles the case where the same prefix is used for different
         // imports.
         return builder
-          ..exports.merge(other.exports,
+          ..exportScope.merge(other.exportScope,
               (String name, Builder existing, Builder member) {
             return buildAmbiguousBuilder(name, existing, member, charOffset,
                 isExport: isExport, isImport: isImport);
           });
       }
     }
     var template =
         isExport ? templateDuplicatedExport : templateDuplicatedImport;
     Message message = template.withArguments(name, uri, otherUri);
     addNit(message, charOffset, fileUri);
@@ skipping 89 matching lines @@
           mixinApplicationClasses.putIfAbsent(name, () => builder);
       if (existing != builder) {
         part.scope.local.remove(name);
       }
     });
     super.includePart(part);
     nativeMethods.addAll(part.nativeMethods);
     boundlessTypeVariables.addAll(part.boundlessTypeVariables);
   }
 }