Stop building export scopes in KernelDriver.

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

 // 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.
 
 import 'dart:async';
 
 import 'package:front_end/file_system.dart';
 import 'package:front_end/src/base/api_signature.dart';
 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';
 import 'package:front_end/src/fasta/ticker.dart';
 import 'package:front_end/src/fasta/uri_translator.dart';
 import 'package:front_end/src/incremental/file_state.dart';
 import 'package:kernel/binary/ast_from_binary.dart';
 import 'package:kernel/core_types.dart';
 import 'package:kernel/kernel.dart' hide Source;
 import 'package:kernel/src/incremental_class_hierarchy.dart';
@@ skipping 195 matching lines @@
       // We need kernel libraries for these URIs.
       var libraryUris = new Set<Uri>();
       var libraryUriToFile = <Uri, FileState>{};
       for (FileState library in cycle.libraries) {
         Uri uri = library.uri;
         libraryUris.add(uri);
         libraryUriToFile[uri] = library;
       }
 
       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.
       List<int> bytes = _byteStore.get(kernelKey);
       if (bytes != null) {
         return _logger.runAsync('Read serialized libraries', () async {
           var program = new Program(nameRoot: nameRoot);
           var reader = new BinaryBuilder(bytes);
           reader.readProgram(program);
 
@@ skipping 30 matching lines @@
         List<int> bytes =
             serializeProgram(program, filter: kernelLibraries.contains);
         _byteStore.put(kernelKey, bytes);
         _logger.writeln('Stored ${bytes.length} bytes.');
       });
 
       return new LibraryCycleResult(cycle, signature, kernelLibraries);
     });
   }
 
-  /// 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();
     saltBuilder.addInt(DATA_VERSION);
     saltBuilder.addBool(_options.strongMode);
     if (_sdkOutlineBytes != null) {
       saltBuilder.addBytes(_sdkOutlineBytes);
     }
     _salt = saltBuilder.toByteList();
   }
@@ skipping 94 matching lines @@
 
   LibraryCycleResult(this.cycle, this.signature, this.kernelLibraries);
 }
 
 @visibleForTesting
 class _TestView {
   /// The list of [LibraryCycle]s compiled for the last delta.
   /// It does not include libraries which were read from the cache.
   final List<LibraryCycle> compiledCycles = [];
 }