Revert "Remove Compiler.assembledCode."

pkg/compiler/lib/src/dart_backend/outputter.dart

 // Copyright (c) 2014, 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.
 
 part of dart_backend;
 
 typedef bool IsSafeToRemoveTypeDeclarations(
     Map<ClassElement, Iterable<Element>> classMembers);
 typedef void ElementCallback<E>(E element);
 typedef void ElementPostProcessFunction(
@@ skipping 37 matching lines @@
   /// referenced in the program.
   ///
   /// [instantiatedClasses] is the set of classes that are potentially
   /// instantiated in the program.
   ///
   /// [resolvedElements] is the set of methods, constructors, and fields that
   /// are potentially accessed/called in the program.
   ///
   /// The [sortElements] function is used to sort [instantiatedClasses] and
   /// [resolvedElements] in the generated output.
-  ///
-  /// Returns the total size of the generated code.
-  int assembleProgram({
+  String assembleProgram({
       MirrorRenamer mirrorRenamer: const MirrorRenamer(),
       Iterable<LibraryElement> libraries,
       Iterable<Element> instantiatedClasses,
       Iterable<Element> resolvedElements,
       Iterable<ClassElement> usedTypeLiterals: const <ClassElement>[],
       FunctionElement mainFunction,
       Uri outputUri,
       ElementPostProcessFunction postProcessElementAst,
       ComputeElementAstFunction computeElementAst,
       ElementFilter shouldOutput,
@@ skipping 44 matching lines @@
         elementInfo);
 
     renamer = createRenamer(
         collector,
         libraryInfo,
         elementInfo,
         enableMinification: enableMinification,
         forceStripTypes: forceStripTypes,
         isSafeToRemoveTypeDeclarations: isSafeToRemoveTypeDeclarations);
 
+    String assembledCode;
     if (outputAst) {
-      String code = astOutput(listener, elementInfo);
-      outputProvider("", "dart")
-                 ..add(code)
-                 ..close();
-      return code.length;
+      assembledCode = astOutput(listener, elementInfo);
     } else {
       output = new MainOutputGenerator();
-      return output.generateCode(
+      assembledCode = output.generateCode(
           libraryInfo,
           elementInfo,
           collector,
           renamer,
           mainFunction,
           outputUri,
           outputProvider,
           mirrorRenamer,
           multiFile: multiFile,
           forceStripTypes: forceStripTypes,
           enableMinification: enableMinification);
     }
+    return assembledCode;
   }
 
   static PlaceholderCollector collectPlaceholders(
       DiagnosticListener listener,
       MirrorRenamer mirrorRenamer,
       FunctionElement mainFunction,
       LibraryInfo libraryInfo,
       ElementInfo elementInfo) {
     // Create all necessary placeholders.
     PlaceholderCollector collector = new PlaceholderCollector(
@@ skipping 272 matching lines @@
   }
 }
 
 /// Main output generator for [DartOutputter] that emits dart code through a
 /// [CompilerOutputProvider].
 class MainOutputGenerator {
   final Map<ClassNode, List<Node>> memberNodes =
        new Map<ClassNode, List<Node>>();
   final List<Node> topLevelNodes = <Node>[];
 
-  /// Generates the code and returns the total size.
-  int generateCode(
+  String generateCode(
       LibraryInfo libraryInfo,
       ElementInfo elementInfo,
       PlaceholderCollector collector,
       PlaceholderRenamer placeholderRenamer,
       FunctionElement mainFunction,
       Uri outputUri,
       CompilerOutputProvider outputProvider,
       MirrorRenamer mirrorRenamer,
       {bool multiFile: false,
        bool forceStripTypes: false,
@@ skipping 87 matching lines @@
       if (node is ClassNode) {
         // TODO(smok): Filter out default constructors here.
         unparser.unparseClassWithBody(node, memberNodes[node]);
       } else {
         unparser.unparse(node);
       }
       unparser.newline();
     }
 
     int totalSize = 0;
+    String assembledCode;
     if (multiFile) {
       for(LibraryElement outputLibrary in libraryInfo.userLibraries) {
         // TODO(sigurdm): Make the unparser output directly into the buffer
         // instead of caching in `.result`.
         String code = unparsers[outputLibrary].result;
         totalSize += code.length;
         outputProvider(outputPaths[outputLibrary], "dart")
              ..add(code)
              ..close();
       }
+      // TODO(sigurdm): We should get rid of compiler.assembledCode.
+      assembledCode = unparsers[mainFunction.library].result;
     } else {
-      String code = mainUnparser.result;
+      assembledCode = mainUnparser.result;
       outputProvider("", "dart")
-           ..add(code)
+           ..add(assembledCode)
            ..close();
 
-      totalSize = code.length;
+      totalSize = assembledCode.length;
     }
 
-    return totalSize;
+    return assembledCode;
   }
 }