[Kernel] Enable Kernel Isolate to use Fasta instead of DartK.

utils/kernel-service/kernel-service.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 runtime.tools.kernel_service;
 
 // This is an interface to the Dart Kernel parser and Kernel binary generator.
 //
 // It is used by the kernel-isolate to load Dart source code and generate
 // Kernel binary format.
 //
 // This is either invoked as the root script of the Kernel isolate when used
 // as a part of
 //
 //           dart --dfe=utils/kernel-service/kernel-service.dart ...
 //
 // invocation or it is invoked as a standalone script to perform batch mode
 // compilation requested via an HTTP interface
 //
 //           dart utils/kernel-service/kernel-service.dart --batch
 //
 // The port for the batch mode worker is controlled by DFE_WORKER_PORT
 // environment declarations (set by -DDFE_WORKER_PORT=... command line flag).
 // When not set (or set to 0) an ephemeral port returned by the OS is used
 // instead.
 //
 // When this script is used as a Kernel isolate root script and DFE_WORKER_PORT
 // is set to non-zero value then Kernel isolate will forward all compilation
 // requests it receives to the batch worker on the given port.
 //
+// Set DFE_USE_FASTA environment declaration to true to use fasta front-end
+// instead of dartk. Note: we expect patched_sdk folder to contain
+// platform.dill file that contains patched SDK in the Kernel binary form.
+// This file can be created using the following command line:
+//
+//   export DART_AOT_SDK=<path-to-patched_sdk>
+//   dart pkg/front_end/lib/src/fasta/bin/compile_platform.dart \
+//        ${DART_AOT_SDK}/platform.dill
+//

[ahe, 2017/02/08 14:13:08]

Nit: this comment should probably be documentation, that is, three slashes
instead of two. Also, the library declaration should come after this comment.
This way, this comment becomes the documentation for this library.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:19]

Done.

 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:typed_data';
 
 import 'package:kernel/analyzer/loader.dart';
 import 'package:kernel/binary/ast_to_binary.dart';
 import 'package:kernel/kernel.dart';
 import 'package:kernel/target/targets.dart';
 
+import 'package:front_end/src/fasta/dill/dill_target.dart' show DillTarget;
+import 'package:front_end/src/fasta/translate_uri.dart' show TranslateUri;
+import 'package:front_end/src/fasta/ticker.dart' show Ticker;
+import 'package:front_end/src/fasta/kernel/kernel_target.dart' show KernelSourceTarget;

[ahe, 2017/02/08 14:13:08]

Long line.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

+import 'package:front_end/src/fasta/ast_kind.dart' show AstKind;
+import 'package:front_end/src/fasta/errors.dart' show InputError;
+
 const bool verbose = const bool.fromEnvironment('DFE_VERBOSE') ?? false;
 const int workerPort = const int.fromEnvironment('DFE_WORKER_PORT') ?? 0;
+const bool useFasta = const bool.fromEnvironment('DFE_USE_FASTA') ?? false;

[ahe, 2017/02/08 14:13:08]

Don't need ?? here as "false" is the default.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

 
 class DataSink implements Sink<List<int>> {
   final BytesBuilder builder = new BytesBuilder();
 
   void add(List<int> data) {
     builder.add(data);
   }
 
   void close() {
     // Nothing to do.
@@ skipping 23 matching lines @@
   String get errorString;
 
   Map<String, dynamic> toJson();
 
   static CompilationFail fromJson(Map m) {
     switch (m['status']) {
       case STATUS_ERROR:
         return new CompilationError(m['errors']);
       case STATUS_CRASH:
         return new CompilationCrash(m['exception'], m['stack']);
+      default:
+        throw "can't deserialize CompilationFail from ${m}";

[ahe, 2017/02/08 14:13:08]

Start with uppercase and end with a period.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

     }
   }
 }
 
 class CompilationError extends CompilationFail {
   final List<String> errors;
 
   CompilationError(this.errors);
 
   List toResponse() => [STATUS_ERROR, errorString];
@@ skipping 20 matching lines @@
         "status": STATUS_CRASH,
         "exception": exception,
         "stack": stack,
       };
 
   String get errorString => "${exception}\n${stack}";
 
   String toString() => "CompilationCrash(${errorString})";
 }
 
+

[ahe, 2017/02/08 14:13:08]

Extra line.

[kustermann, 2017/02/08 15:10:40]

no 2 line requirement here :)

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

 Future<CompilationResult> parseScriptImpl(DartLoaderBatch batch_loader,
     Uri fileName, String packageConfig, String sdkPath) async {
   if (!FileSystemEntity.isFileSync(fileName.path)) {
     throw "Input file '${fileName.path}' does not exist.";
   }
 
   if (!FileSystemEntity.isDirectorySync(sdkPath)) {
     throw "Patched sdk directory not found at $sdkPath";
   }
 
   Target target = getTarget("vm", new TargetFlags(strongMode: false));
-  DartOptions dartOptions = new DartOptions(
-      strongMode: false,
-      strongModeSdk: false,
-      sdk: sdkPath,
-      packagePath: packageConfig,
-      customUriMappings: const {},
-      declaredVariables: const {});
-  DartLoader loader =
-      await batch_loader.getLoader(new Repository(), dartOptions);
-  var program = loader.loadProgram(fileName, target: target);
 
-  var errors = loader.errors;
-  if (errors.isNotEmpty) {
-    return new CompilationError(loader.errors.toList());
+  Program program;
+  if (useFasta) {
+    final uriTranslator = await TranslateUri.parse(new Uri.file(packageConfig));
+    Ticker ticker = new Ticker(isVerbose: false);

[kustermann, 2017/02/08 15:10:41]

final

Not sure what [Ticker] is but you could pass along the 'verbose' we get via
bool.fromEnvironment()?

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

This is for Fasta own diagnostic messages. Great idea to pass down verbose!

+    DillTarget dillTarget = new DillTarget(ticker, uriTranslator);

[kustermann, 2017/02/08 15:10:40]

final

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

+    dillTarget.read(new Uri.directory(sdkPath).resolve('platform.dill'));
+    KernelSourceTarget sourceTarget =
+    new KernelSourceTarget(dillTarget, uriTranslator);

[ahe, 2017/02/08 14:13:08]

Indentation.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

+    try {
+      sourceTarget.read(fileName);
+      await dillTarget.writeOutline(null);
+      program = await sourceTarget.writeOutline(null);
+      program = await sourceTarget.writeProgram(null, AstKind.Kernel);
+      if (sourceTarget.errors.isNotEmpty) {
+        return new CompilationError(sourceTarget.errors
+            .map((err) => err.toString()).toList(growable: false));
+      }
+    } on InputError catch (e) {
+      return new CompilationError(<String>[e.error]);
+    }

[ahe, 2017/02/08 14:13:08]

We need a better API for this. I think Paul and Siggi are working on that, if it
hasn't landed already.

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Yeah, they are working on this. But in the mean while we have to have something
:)

+  } else {
+    DartOptions dartOptions = new DartOptions(
+        strongMode: false,
+        strongModeSdk: false,
+        sdk: sdkPath,
+        packagePath: packageConfig,
+        customUriMappings: const {},
+        declaredVariables: const {});
+    DartLoader loader =
+    await batch_loader.getLoader(new Repository(), dartOptions);

[kustermann, 2017/02/08 15:10:41]

maybe run dartfmt on this file?

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

+    program = loader.loadProgram(fileName, target: target);
+
+    var errors = loader.errors;

[kustermann, 2017/02/08 15:10:41]

final

[Vyacheslav Egorov (Google), 2017/02/08 15:46:18]

Done.

+    if (errors.isNotEmpty) {
+      return new CompilationError(loader.errors.toList());
+    }
   }
 
   // Perform target-specific transformations.
   target.performModularTransformations(program);
   target.performGlobalTransformations(program);
 
   // Write the program to a list of bytes and return it.
   var sink = new DataSink();
   new BinaryPrinter(sink).writeProgramFile(program);
   return new CompilationOk(sink.builder.takeBytes());
@@ skipping 194 matching lines @@
     if (await new File.fromUri(packagesFile).exists()) {
       return packagesFile;
     }
     if (dir.parent.path == dir.path) {
       break;
     }
     dir = dir.parent;
   }
   return null;
 }