Move writeOutline() and writeProgram() out of KernelTarget.

pkg/compiler/lib/src/kernel/fasta_support.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.
 
 /// Additions to Fasta for generating .dill (Kernel IR) files with dart2js patch
 /// files and native hooks.
 library compiler.src.kernel.fasta_support;
 
 // TODO(sigmund): get rid of this file. Fasta should be agnostic of the
 // target platform, at which point this should not be necessary. In particular,
 // we need to:
 //  - add a fasta flag to configure the platform library location.
 //  - add a fasta flag to specify which sdk libraries should be built-in
 //    (that would replace `loadExtraRequiredLibraries`).
 //  - add flags to fasta to turn on various transformations.
 //  - get rid of `native` in dart2js patches or unify the syntax with the VM.
 
 import 'dart:async' show Future;
 import 'dart:io' show exitCode;
 
 import 'package:front_end/physical_file_system.dart';
+import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:kernel/ast.dart' show Source;
 
 import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext;
 import 'package:front_end/src/fasta/dill/dill_target.dart' show DillTarget;
 import 'package:front_end/src/fasta/fasta.dart' show CompileTask;
 import 'package:front_end/src/fasta/kernel/kernel_target.dart'
     show KernelTarget;
 import 'package:front_end/src/fasta/loader.dart' show Loader;
 import 'package:front_end/src/fasta/parser/parser.dart' show optional;
 import 'package:front_end/src/scanner/token.dart' show Token;
 import 'package:front_end/src/fasta/ticker.dart' show Ticker;
 import 'package:front_end/src/fasta/translate_uri.dart' show TranslateUri;
 
 /// Generates a platform.dill file containing the compiled Kernel IR of the
 /// dart2js SDK.
 Future compilePlatform(Uri patchedSdk, Uri fullOutput,
     {Uri outlineOutput, Uri packages}) async {
   Uri deps = Uri.base.resolveUri(new Uri.file("${fullOutput.toFilePath()}.d"));
   TranslateUri uriTranslator = await TranslateUri.parse(
       PhysicalFileSystem.instance, patchedSdk, packages);
   var ticker = new Ticker(isVerbose: false);
   var dillTarget = new DillTargetForDart2js(ticker, uriTranslator);
   var kernelTarget =
       new KernelTargetForDart2js(dillTarget, uriTranslator, false);
 
   kernelTarget.read(Uri.parse("dart:core"));
   await dillTarget.buildOutlines();
-  await kernelTarget.buildOutlines();
-  await kernelTarget.writeOutline(outlineOutput);
+  var outline = await kernelTarget.buildOutlines();
+  if (outlineOutput != null) {

[Siggi Cherem (dart-lang), 2017/05/17 22:01:34]

I'd remove this extra check, you don't seem to have it in some other places
anyways.

[scheglov, 2017/05/17 22:16:04]

Thanks.
I was not sure that it is called in dart2js with outlineOutput always provided.

+    await writeProgramToFileUri(ticker, outlineOutput, outline,
+        isFullProgram: false);
+  }
 
   if (exitCode != 0) return null;
-  await kernelTarget.buildProgram();
-  await kernelTarget.writeProgram(fullOutput);
+  var program = await kernelTarget.buildProgram();
+  await writeProgramToFileUri(ticker, fullOutput, program, isFullProgram: true);
   await kernelTarget.writeDepsFile(fullOutput, deps);
 }
 
 /// Extends the internal fasta [CompileTask] to use a dart2js-aware [DillTarget]
 /// and [KernelTarget].
 class Dart2jsCompileTask extends CompileTask {
   Dart2jsCompileTask(CompilerContext c, Ticker ticker) : super(c, ticker);
 
   @override
   DillTarget createDillTarget(TranslateUri uriTranslator) {
@@ skipping 90 matching lines @@
   'dart:html_common',
   'dart:indexed_db',
   'dart:js',
   'dart:js_util',
   'dart:mirrors',
   'dart:svg',
   'dart:web_audio',
   'dart:web_gl',
   'dart:web_sql',
 ];