Stop building export scopes in KernelDriver.

Fasta already store exports scopes into Kernel.
It was added some time ago and improved recently.
234c4a7

[email protected], [email protected], [email protected]
BUG=

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

Author: scheglov

pkg/front_end/lib/src/incremental/file_state.dart

@@ -46,7 +46,6 @@ class FileState {
   bool _hasMixinApplication;
   List<int> _apiSignature;
 
-  List<NamespaceExport> _exports;
   List<FileState> _importedLibraries;
   List<FileState> _exportedLibraries;
   List<FileState> _partFiles;
@@ -81,9 +80,6 @@ class FileState {
   /// The list of the libraries exported by this library.
   List<FileState> get exportedLibraries => _exportedLibraries;
 
-  /// The list of the exported files with combinators.
-  List<NamespaceExport> get exports => _exports;
-
   @override
   int get hashCode => uri.hashCode;
 
@@ -168,7 +164,6 @@ class FileState {
     _importedLibraries = <FileState>[];
     _exportedLibraries = <FileState>[];
     _partFiles = <FileState>[];
-    _exports = <NamespaceExport>[];
     {
       FileState coreFile = await _getFileForRelativeUri('dart:core');
       // TODO(scheglov) add error handling
@@ -187,7 +182,6 @@ class FileState {
       FileState file = await _getFileForRelativeUri(export_.uri);
       if (file != null) {
         _exportedLibraries.add(file);
-        _exports.add(new NamespaceExport(file, export_.combinators));
       }
     }
     for (var part_ in unlinkedUnit.parts) {
@@ -398,30 +392,6 @@ class LibraryCycle {
   }
 }
 
-/// Information about a single `export` directive.
-class NamespaceExport {
-  final FileState library;
-  final List<UnlinkedCombinator> combinators;
-
-  NamespaceExport(this.library, this.combinators);
-
-  /// Return `true` if the [name] satisfies the sequence of the [combinators].
-  bool isExposed(String name) {
-    for (var combinator in combinators) {
-      if (combinator.isShow) {
-        if (!combinator.names.contains(name)) {
-          return false;
-        }
-      } else {
-        if (combinator.names.contains(name)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-}
-
 /// [FileSystemState] based implementation of [FileSystem].
 /// It provides a consistent view on the known file system state.
 class _FileSystemView implements FileSystem {

pkg/front_end/lib/src/incremental/kernel_driver.dart

@@ -10,7 +10,6 @@ import 'package:front_end/src/base/performace_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/fasta/compiler_context.dart';
-import 'package:front_end/src/fasta/dill/dill_library_builder.dart';
 import 'package:front_end/src/fasta/dill/dill_target.dart';
 import 'package:front_end/src/fasta/kernel/kernel_target.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
@@ -226,14 +225,8 @@ class KernelDriver {
       }
 
       Future<Null> appendNewDillLibraries(Program program) async {
-        List<DillLibraryBuilder> libraryBuilders = dillTarget.loader
-            .appendLibraries(program, (uri) => libraryUris.contains(uri));
-
-        // Compute local scopes.
+        dillTarget.loader.appendLibraries(program, libraryUris.contains);
         await dillTarget.buildOutlines();
-
-        // Compute export scopes.
-        _computeExportScopes(dillTarget, libraryUriToFile, libraryBuilders);
       }
 
       // Check if there is already a bundle with these libraries.
@@ -284,34 +277,6 @@ class KernelDriver {
     });
   }
 
-  /// Compute exports scopes for a new strongly connected cycle of [libraries].
-  /// The [dillTarget] can be used to access libraries from previous cycles.
-  /// TODO(scheglov) Remove/replace this when Kernel has export scopes.
-  void _computeExportScopes(DillTarget dillTarget,
-      Map<Uri, FileState> uriToFile, List<DillLibraryBuilder> libraries) {
-    bool wasChanged = false;
-    do {
-      wasChanged = false;
-      for (DillLibraryBuilder library in libraries) {
-        FileState file = uriToFile[library.uri];
-        for (NamespaceExport export in file.exports) {
-          DillLibraryBuilder exportedLibrary =
-              dillTarget.loader.read(export.library.uri, -1, accessor: library);
-          if (exportedLibrary != null) {
-            exportedLibrary.exportScope.forEach((name, member) {
-              if (export.isExposed(name) &&
-                  library.addToExportScope(name, member)) {
-                wasChanged = true;
-              }
-            });
-          } else {
-            // TODO(scheglov) How to handle this?
-          }
-        }
-      }
-    } while (wasChanged);
-  }
-
   /// Compute salt and put into [_salt].
   void _computeSalt() {
     var saltBuilder = new ApiSignature();

pkg/front_end/test/src/incremental/file_state_test.dart

@@ -5,13 +5,13 @@
 import 'dart:async';
 
 import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/src/fasta/uri_translator_impl.dart';
 import 'package:front_end/src/byte_store/byte_store.dart';
+import 'package:front_end/src/fasta/uri_translator_impl.dart';
 import 'package:front_end/src/incremental/file_state.dart';
+import 'package:kernel/target/targets.dart';
 import 'package:package_config/packages.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
-import 'package:kernel/target/targets.dart';
 
 import 'mock_sdk.dart';
 
@@ -224,62 +224,6 @@ part "c.dart";
     expect(bFile.partFiles, isEmpty);
   }
 
-  test_getFile_exports() async {
-    var a = writeFile('/a.dart', '');
-    var b = writeFile('/b.dart', '');
-    var c = writeFile('/c.dart', '');
-    var d = writeFile('/d.dart', r'''
-export "a.dart" show A, B;
-export "b.dart" hide C, D;
-export "c.dart" show A, B, C, D hide C show A, D;
-''');
-
-    FileState aFile = await fsState.getFile(a);
-    FileState bFile = await fsState.getFile(b);
-    FileState cFile = await fsState.getFile(c);
-    FileState dFile = await fsState.getFile(d);
-
-    expect(dFile.exports, hasLength(3));
-    {
-      NamespaceExport export_ = dFile.exports[0];
-      expect(export_.library, aFile);
-      expect(export_.combinators, hasLength(1));
-      expect(export_.combinators[0].isShow, isTrue);
-      expect(export_.combinators[0].names, unorderedEquals(['A', 'B']));
-      expect(export_.isExposed('A'), isTrue);
-      expect(export_.isExposed('B'), isTrue);
-      expect(export_.isExposed('C'), isFalse);
-      expect(export_.isExposed('D'), isFalse);
-    }
-    {
-      NamespaceExport export_ = dFile.exports[1];
-      expect(export_.library, bFile);
-      expect(export_.combinators, hasLength(1));
-      expect(export_.combinators[0].isShow, isFalse);
-      expect(export_.combinators[0].names, unorderedEquals(['C', 'D']));
-      expect(export_.isExposed('A'), isTrue);
-      expect(export_.isExposed('B'), isTrue);
-      expect(export_.isExposed('C'), isFalse);
-      expect(export_.isExposed('D'), isFalse);
-    }
-    {
-      NamespaceExport export_ = dFile.exports[2];
-      expect(export_.library, cFile);
-      expect(export_.combinators, hasLength(3));
-      expect(export_.combinators[0].isShow, isTrue);
-      expect(
-          export_.combinators[0].names, unorderedEquals(['A', 'B', 'C', 'D']));
-      expect(export_.combinators[1].isShow, isFalse);
-      expect(export_.combinators[1].names, unorderedEquals(['C']));
-      expect(export_.combinators[2].isShow, isTrue);
-      expect(export_.combinators[2].names, unorderedEquals(['A', 'D']));
-      expect(export_.isExposed('A'), isTrue);
-      expect(export_.isExposed('B'), isFalse);
-      expect(export_.isExposed('C'), isFalse);
-      expect(export_.isExposed('D'), isTrue);
-    }
-  }
-
   test_hasMixinApplication_false() async {
     writeFile('/a.dart', r'''
 class A {}