Serialize exports scopes.

[email protected]

Review-Url: https://codereview.chromium.org/3009573002 .

Author: peter-ahe-google

pkg/front_end/lib/src/fasta/builder/invalid_type_builder.dart

@@ -4,12 +4,16 @@
 
 library fasta.invalid_type_builder;
 
+import '../fasta_codes.dart' show Message;
+
 import 'builder.dart' show TypeBuilder, TypeDeclarationBuilder;
 
 abstract class InvalidTypeBuilder<T extends TypeBuilder, R>
     extends TypeDeclarationBuilder<T, R> {
   InvalidTypeBuilder(String name, int charOffset, [Uri fileUri])
       : super(null, 0, name, null, charOffset, fileUri);
 
+  Message get message;
+
   String get debugName => "InvalidTypeBuilder";
 }

pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart

@@ -4,8 +4,20 @@
 
 library fasta.dill_library_builder;
 
+import 'dart:convert' show JSON;
+
 import 'package:kernel/ast.dart'
-    show Class, Field, Library, ListLiteral, Member, StaticGet, Typedef;
+    show
+        Class,
+        Field,
+        Library,
+        ListLiteral,
+        Member,
+        StaticGet,
+        StringLiteral,
+        Typedef;
+
+import '../fasta_codes.dart' show templateUnspecified;
 
 import '../problems.dart' show unimplemented;
 
@@ -35,6 +47,19 @@ class DillLibraryBuilder extends LibraryBuilder<KernelTypeBuilder, Library> {
 
   Library library;
 
+  /// Exports in addition to the members declared in this library.
+  ///
+  /// Each entry in the list is either two or three elements long.
+  ///
+  /// The first element is the library URI, if it is null, this is an ambiguous
+  /// export and the list has three elements. Otherwise the list has two
+  /// elements.
+  ///
+  /// The second element is the name of the exported element.
+  ///
+  /// The third element (if present) is an error message.
+  List<List<String>> additionalExports;
+
   DillLibraryBuilder(this.uri, this.loader)
       : super(uri, new Scope.top(), new Scope.top());
 
@@ -64,9 +89,9 @@ class DillLibraryBuilder extends LibraryBuilder<KernelTypeBuilder, Library> {
   void addMember(Member member) {
     String name = member.name.name;
     if (name == "_exports#") {
-      // TODO(ahe): Add this to exportScope.
-      // This is a hack / work around for storing exports in dill files. See
-      // [compile_platform_dartk.dart](../analyzer/compile_platform_dartk.dart).
+      Field field = member;
+      StringLiteral string = field.initializer;
+      additionalExports = JSON.decode(string.value);
     } else {
       addBuilder(name, new DillMemberBuilder(member, this), member.fileOffset);
     }
@@ -118,4 +143,28 @@ class DillLibraryBuilder extends LibraryBuilder<KernelTypeBuilder, Library> {
   String get fullNameForErrors {
     return library.name ?? "<library '${library.fileUri}'>";
   }
+
+  void finalizeExports() {
+    if (additionalExports != null) {
+      for (List<String> additionalExport in additionalExports) {
+        Uri originUri = Uri.parse(additionalExport[0]);
+        String name = additionalExport[1];
+        Builder builder;
+        if (originUri == null) {
+          builder = new KernelInvalidTypeBuilder(name, -1, null,
+              templateUnspecified.withArguments(additionalExport[2]));
+        } else {
+          DillLibraryBuilder library = loader.read(originUri, -1);
+          builder = library.exportScopeBuilder[name];
+          if (library != null) {
+            builder = library.exportScopeBuilder[name];
+          }
+          if (builder == null) {
+            builder = new KernelInvalidTypeBuilder(name, -1, null);
+          }
+        }
+        exportScopeBuilder.addMember(name, builder);
+      }
+    }
+  }
 }

pkg/front_end/lib/src/fasta/dill/dill_loader.dart

@@ -8,6 +8,8 @@ import 'dart:async' show Future;
 
 import 'package:kernel/ast.dart' show Library, Program, Source;
 
+import '../kernel/kernel_builder.dart' show LibraryBuilder;
+
 import '../loader.dart' show Loader;
 
 import '../problems.dart' show unhandled;
@@ -55,4 +57,11 @@ class DillLoader extends Loader<Library> {
   Future<Null> buildBody(DillLibraryBuilder builder) {
     return buildOutline(builder);
   }
+
+  void finalizeExports() {
+    builders.forEach((Uri uri, LibraryBuilder builder) {
+      DillLibraryBuilder library = builder;
+      library.finalizeExports();
+    });
+  }
 }

pkg/front_end/lib/src/fasta/dill/dill_target.dart

@@ -51,6 +51,7 @@ class DillTarget extends TargetImplementation {
   Future<Null> buildOutlines() async {
     if (loader.libraries.isNotEmpty) {
       await loader.buildOutlines();
+      loader.finalizeExports();
     }
     isLoaded = true;
   }

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

@@ -13,6 +13,7 @@ import 'kernel_builder.dart'
 
 class KernelInvalidTypeBuilder
     extends InvalidTypeBuilder<KernelTypeBuilder, DartType> {
+  @override
   final Message message;
 
   KernelInvalidTypeBuilder(String name, int charOffset, Uri fileUri,

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

@@ -4,6 +4,8 @@
 
 library fasta.kernel_library_builder;
 
+import 'dart:convert' show JSON;
+
 import 'package:front_end/src/fasta/combinator.dart' as fasta;
 import 'package:front_end/src/fasta/export.dart';
 import 'package:front_end/src/fasta/import.dart';
@@ -780,6 +782,14 @@ class KernelLibraryBuilder
 
     library.name = name;
     library.procedures.sort(compareProcedures);
+
+    if (additionalExports != null) {
+      library.addMember(new Field(new Name("_exports#", library),
+          initializer: new StringLiteral(JSON.encode(additionalExports)),
+          isStatic: true,
+          isConst: true));
+    }
+
     return library;
   }
 

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

@@ -17,6 +17,7 @@ import '../builder/builder.dart'
         ConstructorReferenceBuilder,
         FormalParameterBuilder,
         FunctionTypeBuilder,
+        InvalidTypeBuilder,
         LibraryBuilder,
         MemberBuilder,
         MetadataBuilder,
@@ -96,6 +97,12 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
 
   bool canAddImplementationBuilders = false;
 
+  /// Exports in addition to the members declared in this library.
+  ///
+  /// See [../dill/dill_library_builder.dart] for additional details on the
+  /// format used.
+  List<List<String>> additionalExports;
+
   SourceLibraryBuilder(SourceLoader loader, Uri fileUri)
       : this.fromScopes(loader, fileUri, new DeclarationBuilder<T>.library(),
             new Scope.top());
@@ -512,6 +519,19 @@ abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
         addToScope(name, member, -1, true);
       });
     }
+    exportScope.forEach((String name, Builder member) {
+      if (member.parent != this) {
+        additionalExports ??= <List<String>>[];
+        Builder parent = member.parent;
+        if (parent is LibraryBuilder) {
+          additionalExports.add(<String>["${parent.uri}", name]);
+        } else {
+          InvalidTypeBuilder invalidType = member;
+          String message = invalidType.message.message;
+          additionalExports.add(<String>[null, name, message]);
+        }
+      }
+    });
   }
 
   @override

pkg/front_end/messages.yaml

@@ -913,3 +913,4 @@ InvalidPackageUri:
 IntegerLiteralIsOutOfRange:
   template: "The integer literal #lexeme can't be represented in 64 bits."
   tip: "Try using BigInt (from 'dart:typed_data' library) if you need an integer larger than 9,223,372,036,854,775,807 or less than -9,223,372,036,854,775,808."
+

pkg/front_end/testcases/export_test.dart

@@ -0,0 +1,16 @@
+// Copyright (c) 2017, 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.
+
+/// Test that exports are serialized in platform.dill.
+
+// Note: "dart:profiler" exports UserTag from "dart:developer". This is
+// somewhat brittle and we should extend this test framework to be able to deal
+// with multiple .dill files.
+import 'dart:profiler' show UserTag;
+
+export 'dart:core' show print;
+
+main() {
+  print(UserTag);
+}

pkg/front_end/testcases/export_test.dart.direct.expect

@@ -0,0 +1,9 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "dart:developer" as dev;
+
+static const field dynamic _exports# = "[[\"dart:core\",\"print\"]]" /* from null */;
+static method main() → dynamic {
+  core::print(dev::UserTag);
+}

pkg/front_end/testcases/export_test.dart.outline.expect

@@ -0,0 +1,6 @@
+library;
+import self as self;
+
+static const field dynamic _exports# = "[[\"dart:core\",\"print\"]]" /* from null */;
+static method main() → dynamic
+  ;

pkg/front_end/testcases/export_test.dart.strong.expect

@@ -0,0 +1,9 @@
+library;
+import self as self;
+import "dart:core" as core;
+import "dart:developer" as dev;
+
+static const field dynamic _exports# = "[[\"dart:core\",\"print\"]]" /* from null */;
+static method main() → dynamic {
+  core::print(dev::UserTag);
+}

pkg/front_end/testcases/outline.status

@@ -278,3 +278,5 @@ rasta/type_with_parse_error: Fail
 regress/issue_29977: Crash # Issue 29977.
 regress/issue_29985: Crash # Issue 29985.
 regress/issue_29987: Crash # Issue 29987.
+
+rasta/export: Fail # TODO(ahe): Remove absolute URI.