Revert "Remove Compiler.assembledCode."

tests/compiler/dart2js/compiler_helper.dart

 // Copyright (c) 2012, 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 compiler_helper;
 
 import 'dart:async';
 import "package:expect/expect.dart";
 
-import 'package:compiler/compiler.dart' as api;
-
 import 'package:compiler/src/elements/elements.dart'
        as lego;
 export 'package:compiler/src/elements/elements.dart';
 
 import 'package:compiler/src/js_backend/js_backend.dart'
        as js;
 
 import 'package:compiler/src/dart2jslib.dart'
        as leg;
 export 'package:compiler/src/dart2jslib.dart'
        show Constant,
             Message,
             MessageKind,
             Selector,
             TypedSelector,
             SourceSpan,
             World;
 
+import 'package:compiler/src/ssa/ssa.dart' as ssa;
+
 import 'package:compiler/src/types/types.dart'
        as types;
 export 'package:compiler/src/types/types.dart'
        show TypeMask;
 
 import 'package:compiler/src/util/util.dart';
 export 'package:compiler/src/util/util.dart';
 
+import 'package:compiler/src/source_file.dart';
+
 import 'package:compiler/src/dart2jslib.dart'
        show Compiler;
 
 export 'package:compiler/src/tree/tree.dart';
 
 import 'mock_compiler.dart';
 export 'mock_compiler.dart';
 
-import 'output_collector.dart';
-export 'output_collector.dart';
-
 Future<String> compile(String code,
                        {String entry: 'main',
                         bool enableTypeAssertions: false,
                         bool minify: false,
                         bool analyzeAll: false,
                         bool disableInlining: true,
                         void check(String generated)}) {
   MockCompiler compiler = new MockCompiler.internal(
       enableTypeAssertions: enableTypeAssertions,
       // Type inference does not run when manually
@@ skipping 29 matching lines @@
 
 // TODO(herhut): Disallow warnings and errors during compilation by default.
 MockCompiler compilerFor(String code, Uri uri,
                          {bool analyzeAll: false,
                           bool analyzeOnly: false,
                           Map<String, String> coreSource,
                           bool disableInlining: true,
                           bool minify: false,
                           bool trustTypeAnnotations: false,
                           int expectedErrors,
-                          int expectedWarnings,
-                          api.CompilerOutputProvider outputProvider}) {
+                          int expectedWarnings}) {
   MockCompiler compiler = new MockCompiler.internal(
       analyzeAll: analyzeAll,
       analyzeOnly: analyzeOnly,
       coreSource: coreSource,
       disableInlining: disableInlining,
       enableMinification: minify,
       trustTypeAnnotations: trustTypeAnnotations,
       expectedErrors: expectedErrors,
-      expectedWarnings: expectedWarnings,
-      outputProvider: outputProvider);
+      expectedWarnings: expectedWarnings);
   compiler.registerSource(uri, code);
   return compiler;
 }
 
 Future<String> compileAll(String code,
                           {Map<String, String> coreSource,
-                           bool disableInlining: true,
-                           bool trustTypeAnnotations: false,
-                           bool minify: false,
-                           int expectedErrors,
-                           int expectedWarnings}) {
+                          bool disableInlining: true,
+                          bool trustTypeAnnotations: false,
+                          bool minify: false,
+                          int expectedErrors,
+                          int expectedWarnings}) {
   Uri uri = new Uri(scheme: 'source');
-  OutputCollector outputCollector = new OutputCollector();
   MockCompiler compiler = compilerFor(
       code, uri, coreSource: coreSource, disableInlining: disableInlining,
       minify: minify, expectedErrors: expectedErrors,
       trustTypeAnnotations: trustTypeAnnotations,
-      expectedWarnings: expectedWarnings,
-      outputProvider: outputCollector);
+      expectedWarnings: expectedWarnings);
   return compiler.runCompiler(uri).then((_) {
     Expect.isFalse(compiler.compilationFailed,
                    'Unexpected compilation error(s): ${compiler.errors}');
-    return outputCollector.getOutput('', 'js');
+    return compiler.assembledCode;
   });
 }
 
 Future compileAndCheck(String code,
                        String name,
                        check(MockCompiler compiler, lego.Element element),
                        {int expectedErrors, int expectedWarnings}) {
   Uri uri = new Uri(scheme: 'source');
   MockCompiler compiler = compilerFor(code, uri,
       expectedErrors: expectedErrors,
@@ skipping 37 matching lines @@
   var sourceName = name;
   var element = compiler.mainApp.find(sourceName);
   if (element == null) {
     element = compiler.backend.interceptorsLibrary.find(sourceName);
   }
   if (element == null) {
     element = compiler.coreLibrary.find(sourceName);
   }
   Expect.isNotNull(element, 'Could not locate $name');
   switch (how) {
-    case 'exact':
-      return new types.TypeMask.exact(element, compiler.world);
-    case 'nonNullExact':
-      return new types.TypeMask.nonNullExact(element, compiler.world);
-    case 'subclass':
+    case 'exact': return new types.TypeMask.exact(element);
+    case 'nonNullExact': return new types.TypeMask.nonNullExact(element);
+    case 'subclass': {
       return new types.TypeMask.subclass(element, compiler.world);
-    case 'nonNullSubclass':
+    }
+    case 'nonNullSubclass': {
       return new types.TypeMask.nonNullSubclass(element, compiler.world);
-    case 'subtype':
+    }
+    case 'subtype': {
       return new types.TypeMask.subtype(element, compiler.world);
-    case 'nonNullSubtype':
+    }
+    case 'nonNullSubtype': {
       return new types.TypeMask.nonNullSubtype(element, compiler.world);
+    }
   }
   Expect.fail('Unknown TypeMask constructor $how');
-  return null;
 }
 
 String anyIdentifier = "[a-zA-Z][a-zA-Z0-9]*";
 
 String getIntTypeCheck(String variable) {
   return "\\($variable ?!== ?\\($variable ?\\| ?0\\)|"
          "\\($variable ?>>> ?0 ?!== ?$variable";
 }
 
 String getNumberTypeCheck(String variable) {
@@ skipping 42 matching lines @@
     regexp = regexp.replaceAll(xRe, '(?:$anyIdentifier)');
     final spaceRe = new RegExp('\\s+');
     regexp = regexp.replaceAll(spaceRe, '(?:\\s*)');
     if (shouldMatch) {
       Expect.isTrue(new RegExp(regexp).hasMatch(generated));
     } else {
       Expect.isFalse(new RegExp(regexp).hasMatch(generated));
     }
   });
 }