Revert "First step for modular output in fasta."

pkg/front_end/lib/src/fasta/kernel/kernel_target.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_target;
 
 import 'dart:async' show Future;
 
 import 'dart:io' show File;
 
@@ skipping 65 matching lines @@
         KernelNamedTypeBuilder,
         KernelProcedureBuilder,
         LibraryBuilder,
         MemberBuilder,
         NamedTypeBuilder,
         TypeBuilder,
         TypeDeclarationBuilder,
         TypeVariableBuilder;
 
 import 'verifier.dart' show verifyProgram;
-import 'kernel_outline_shaker.dart'
-    show trimProgram, RetainedDataBuilder, RootsMarker;
 
 class KernelTarget extends TargetImplementation {
   /// The [FileSystem] which should be used to access files.
   final FileSystem fileSystem;
 
   final bool strongMode;
 
   final DillTarget dillTarget;
 
   /// Shared with [CompilerContext].
@@ skipping 111 matching lines @@
     cls.implementedTypes.clear();
     cls.supertype = null;
     cls.mixedInType = null;
     builder.supertype = new KernelNamedTypeBuilder("Object", null,
         builder.charOffset, builder.fileUri ?? Uri.parse(cls.fileUri))
       ..builder = objectClassBuilder;
     builder.interfaces = null;
     builder.mixedInType = null;
   }
 
-  void handleInputError(InputError error,
-      {bool isFullProgram, bool trimDependencies: false}) {
+  void handleInputError(InputError error, {bool isFullProgram}) {
     if (error != null) {
       String message = error.format();
       print(message);
       errors.add(message);
     }
     _program = erroneousProgram(isFullProgram);
-    if (trimDependencies) {
-      trimDependenciesInProgram(_program, dillTarget.loader.libraries);
-    }
   }
 
   @override
   Future<Program> buildOutlines({CanonicalName nameRoot}) async {
     if (loader.first == null) return null;
     try {
       loader.createTypeInferenceEngine();
       await loader.buildOutlines();
       loader.coreLibrary
           .becomeCoreLibrary(const DynamicType(), const VoidType());
@@ skipping 15 matching lines @@
       loader.prepareInitializerInference();
       loader.performInitializerInference();
     } on InputError catch (e) {
       handleInputError(e, isFullProgram: false);
     } catch (e, s) {
       return reportCrash(e, s, loader?.currentUriForCrashReporting);
     }
     return _program;
   }
 
-  /// Build the kernel representation of the program loaded by this target. The
-  /// program will contain full bodies for the code loaded from sources, and
-  /// only references to the code loaded by the [DillTarget], which may or may
-  /// not include method bodies (depending on what was loaded into that target,
-  /// an outline or a full kernel program).
-  ///
-  /// When [trimDependencies] is true, this also runs a tree-shaker that deletes
-  /// anything from the [DillTarget] that is not needed for the source program,
-  /// this includes function bodies and types that are not reachable.
-  ///
-  /// If [verify], run the default kernel verification on the resulting program.
   @override
-  Future<Program> buildProgram(
-      {bool verify: false, bool trimDependencies: false}) async {
+  Future<Program> buildProgram({bool verify: false}) async {
     if (loader.first == null) return null;
     if (errors.isNotEmpty) {
-      handleInputError(null,
-          isFullProgram: true, trimDependencies: trimDependencies);
+      handleInputError(null, isFullProgram: true);
       return _program;
     }
     try {
       await loader.buildBodies();
-      _program = link(new List<Library>.from(loader.libraries),
-          trimDependencies: trimDependencies);
       loader.finishStaticInvocations();
       finishAllConstructors();
       loader.finishNativeMethods();
       runBuildTransformations();
 
       if (verify) this.verify();
       errors.addAll(loader.collectCompileTimeErrors().map((e) => e.format()));
       if (errors.isNotEmpty) {
-        handleInputError(null,
-            isFullProgram: true, trimDependencies: trimDependencies);
+        handleInputError(null, isFullProgram: true);
       }
     } on InputError catch (e) {
-      handleInputError(e,
-          isFullProgram: true, trimDependencies: trimDependencies);
+      handleInputError(e, isFullProgram: true);
     } catch (e, s) {
       return reportCrash(e, s, loader?.currentUriForCrashReporting);
     }
     return _program;
   }
 
   Future writeDepsFile(Uri output, Uri depsFile,
       {Iterable<Uri> extraDependencies}) async {
     String toRelativeFilePath(Uri uri) {
       // Ninja expects to find file names relative to the current working
@@ skipping 53 matching lines @@
       library.addBuilder(mainBuilder.name, mainBuilder, -1);
       mainBuilder.body = new ExpressionStatement(
           new Throw(new StringLiteral("${errors.join('\n')}")));
     }
     library.build(loader.coreLibrary);
     return link(<Library>[library.library]);
   }
 
   /// Creates a program by combining [libraries] with the libraries of
   /// `dillTarget.loader.program`.
-  Program link(List<Library> libraries,
-      {CanonicalName nameRoot, bool trimDependencies: false}) {
+  Program link(List<Library> libraries, {CanonicalName nameRoot}) {
     Map<String, Source> uriToSource =
         new Map<String, Source>.from(this.uriToSource);
 
-    List<Library> extraLibraries = dillTarget.loader.libraries;
-    libraries.addAll(extraLibraries);
+    libraries.addAll(dillTarget.loader.libraries);
     // TODO(scheglov) Should we also somehow update `uriToSource`?
 //    uriToSource.addAll(binary.uriToSource);
 
     // TODO(ahe): Remove this line. Kernel seems to generate a default line map
     // that used when there's no fileUri on an element. Instead, ensure all
     // elements have a fileUri.
     uriToSource[""] = new Source(<int>[0], const <int>[]);
     Program program = new Program(
         nameRoot: nameRoot, libraries: libraries, uriToSource: uriToSource);
     if (loader.first != null) {
-      // TODO(sigmund): do only for full program
       Builder builder = loader.first.lookup("main", -1, null);
       if (builder is KernelProcedureBuilder) {
         program.mainMethod = builder.procedure;
       }
     }
-    if (trimDependencies) {
-      trimDependenciesInProgram(program, extraLibraries);
+    if (errors.isEmpty || dillTarget.isLoaded) {
+      runLinkTransformations(program);
     }
-
     ticker.logMs("Linked program");
     return program;
   }
 
   void installDefaultSupertypes() {
     Class objectClass = this.objectClass;
     loader.builders.forEach((Uri uri, LibraryBuilder library) {
       library.forEach((String name, Builder builder) {
         if (builder is SourceClassBuilder) {
           Class cls = builder.target;
@@ skipping 245 matching lines @@
     });
   }
 
   /// Run all transformations that are needed when building a program for the
   /// first time.
   void runBuildTransformations() {
     transformMixinApplications();
     otherTransformations();
   }
 
+  /// Run all transformations that are needed when linking a program.
+  void runLinkTransformations(Program program) {}
+
   void transformMixinApplications() {
     new MixinFullResolution().transform(_program);
     ticker.logMs("Transformed mixin applications");
   }
 
   void otherTransformations() {
     // TODO(ahe): Don't generate type variables in the first place.
     if (!strongMode) {
       _program.accept(new Erasure());
       ticker.logMs("Erased type variables in generic methods");
@@ skipping 20 matching lines @@
   }
   for (Constructor constructor in superclass.constructors) {
     if (constructor.name.name.isEmpty) {
       return constructor.function.requiredParameterCount == 0
           ? constructor
           : null;
     }
   }
   return null;
 }
-
-/// Tree-shakes most code from [librariesToShake] by visiting all other
-/// libraries in [program] and marking the APIs from [librariesToShake] that are
-/// in use.
-trimDependenciesInProgram(Program program, List<Library> librariesToShake) {
-  var toShake = librariesToShake.map((lib) => lib.importUri).toSet();
-  var isIncluded = (Uri uri) => !toShake.contains(uri);
-  var data = new RetainedDataBuilder();
-  // TODO(sigmund): replace this step with data that is directly computed from
-  // the builders: we should know the tree-shaking roots without having to do a
-  // second visit over the tree.
-  new RootsMarker(data).run(program, isIncluded);
-  trimProgram(program, data, isIncluded);
-}