Store actual Reference(s) for additional exports.

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 307b574e96e018b28e5fd141b06670f50c4cca7c..ff31b6f4df5cf4de23f44dc3ffa65bcdbe2d2e09 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
@@ -4,7 +4,7 @@
 
 library fasta.source_library_builder;
 
-import 'package:kernel/ast.dart' show ProcedureKind;
+import 'package:kernel/ast.dart' show ProcedureKind, Reference;
 
 import '../../base/resolve_relative_uri.dart' show resolveRelativeUri;
 
@@ -17,7 +17,6 @@ import '../builder/builder.dart'
         ConstructorReferenceBuilder,
         FormalParameterBuilder,
         FunctionTypeBuilder,
-        InvalidTypeBuilder,
         LibraryBuilder,
         MemberBuilder,
         MetadataBuilder,
@@ -54,8 +53,6 @@ import '../import.dart' show Import;
 
 import '../problems.dart' show unhandled;
 
-import '../util/relativize.dart' show relativizeUri;
-
 import 'source_loader.dart' show SourceLoader;
 
 abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
@@ -103,7 +100,7 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
   ///
   /// See [../dill/dill_library_builder.dart] for additional details on the
   /// format used.

[ahe, 2017/08/29 11:04:23]

This documentation should be updated.

[scheglov, 2017/08/29 15:16:26]

Done.

-  List<List<String>> additionalExports;
+  List<Reference> additionalExports;
 
   SourceLibraryBuilder(SourceLoader loader, Uri fileUri)
       : this.fromScopes(loader, fileUri, new DeclarationBuilder<T>.library(),
@@ -523,17 +520,10 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
     }
     exportScope.forEach((String name, Builder member) {
       if (member.parent != this) {
-        additionalExports ??= <List<String>>[];
+        additionalExports ??= <Reference>[];
         Builder parent = member.parent;
         if (parent is LibraryBuilder) {
-          additionalExports.add(<String>[
-            relativizeUri(parent.uri, base: uri.resolve(".")),
-            name
-          ]);
-        } else {
-          InvalidTypeBuilder invalidType = member;
-          String message = invalidType.message.message;
-          additionalExports.add(<String>[null, name, message]);
+          additionalExports.add(member.target.reference);
         }
       }
     });