Add getTarget method to CompilerCommandLine

pkg/front_end/lib/src/fasta/fasta.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;
 
 import 'dart:async' show Future;
 
 import 'dart:convert' show JSON;
 
 import 'dart:io' show BytesBuilder, Directory, File, exitCode;
 
 import 'package:front_end/file_system.dart';
 import 'package:front_end/physical_file_system.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:kernel/binary/ast_to_binary.dart'
     show LibraryFilteringBinaryPrinter;
 
 import 'package:kernel/kernel.dart' show Library, Program, loadProgramFromBytes;
 
-import 'package:kernel/target/targets.dart' show getTarget, TargetFlags;
+import 'package:kernel/target/targets.dart' show Target;
 
 import 'compiler_command_line.dart' show CompilerCommandLine;
 
 import 'compiler_context.dart' show CompilerContext;
 
 import 'errors.dart' show InputError, formatUnexpected, inputError, reportCrash;
 
 import 'kernel/kernel_target.dart' show KernelTarget;
 
 import 'dill/dill_target.dart' show DillTarget;
@@ skipping 75 matching lines @@
   }
 }
 
 class CompileTask {
   final CompilerContext c;
   final Ticker ticker;
 
   CompileTask(this.c, this.ticker);
 
   DillTarget createDillTarget(TranslateUri uriTranslator) {
-    return new DillTarget(
-        ticker,
-        uriTranslator,
-        getTarget(c.options.target,
-            new TargetFlags(strongMode: c.options.strongMode)));
+    return new DillTarget(ticker, uriTranslator, c.options.target);
   }
 
   KernelTarget createKernelTarget(
       DillTarget dillTarget, TranslateUri uriTranslator, bool strongMode) {
     return new KernelTarget(
         c.fileSystem, dillTarget, uriTranslator, c.uriToSource);
   }
 
   Future<KernelTarget> buildOutline([Uri output]) async {
     TranslateUri uriTranslator = await TranslateUri
@@ skipping 37 matching lines @@
     if (c.options.dumpIr) {
       printProgramText(program, libraryFilter: kernelTarget.isSourceLibrary);
     }
     await writeProgramToFile(program, uri);
     ticker.logMs("Wrote program to ${uri.toFilePath()}");
     return uri;
   }
 }
 
 Future<CompilationResult> parseScript(
-    Uri fileName, Uri packages, Uri patchedSdk,
-    {bool verbose: false, bool strongMode: false}) async {
-  return parseScriptInFileSystem(
-      fileName, PhysicalFileSystem.instance, packages, patchedSdk,
-      verbose: verbose, strongMode: strongMode);
+    Uri fileName, Uri packages, Uri patchedSdk, Target backendTarget,
+    {bool verbose: false}) async {
+  return parseScriptInFileSystem(fileName, PhysicalFileSystem.instance,
+      packages, patchedSdk, backendTarget,
+      verbose: verbose);
 }
 
-Future<CompilationResult> parseScriptInFileSystem(
-    Uri fileName, FileSystem fileSystem, Uri packages, Uri patchedSdk,
-    {bool verbose: false, bool strongMode: false, String backendTarget}) async {
-  backendTarget ??= "vm_fasta";
+Future<CompilationResult> parseScriptInFileSystem(Uri fileName,
+    FileSystem fileSystem, Uri packages, Uri patchedSdk, Target backendTarget,
+    {bool verbose: false}) async {
   try {
     if (!await fileSystem.entityForUri(fileName).exists()) {
       return new CompilationResult.error(
           formatUnexpected(fileName, -1, "No such file."));
     }
     if (!await new Directory.fromUri(patchedSdk).exists()) {
       return new CompilationResult.error(
           formatUnexpected(patchedSdk, -1, "Patched sdk directory not found."));
     }
 
     Program program;
     try {
       TranslateUri uriTranslator =
           await TranslateUri.parse(fileSystem, patchedSdk, packages: packages);
       final Ticker ticker = new Ticker(isVerbose: verbose);
-      final DillTarget dillTarget = new DillTarget(ticker, uriTranslator,
-          getTarget(backendTarget, new TargetFlags(strongMode: strongMode)));
+      final DillTarget dillTarget =
+          new DillTarget(ticker, uriTranslator, backendTarget);
       _appendDillForUri(dillTarget, patchedSdk.resolve('platform.dill'));
       final KernelTarget kernelTarget =
           new KernelTarget(fileSystem, dillTarget, uriTranslator);
       kernelTarget.read(fileName);
       await dillTarget.buildOutlines();
       await kernelTarget.buildOutlines();
       program = await kernelTarget.buildProgram();
       if (kernelTarget.errors.isNotEmpty) {
         return new CompilationResult.errors(kernelTarget.errors);
       }
@@ skipping 44 matching lines @@
     {Uri sdk,
     Uri packages,
     Uri platform,
     Iterable<Uri> extraDependencies,
     bool verbose: false,
     String backendTarget}) async {
   backendTarget ??= "vm_fasta";
   Ticker ticker = new Ticker(isVerbose: verbose);
   await CompilerCommandLine.withGlobalOptions("", [""],
       (CompilerContext c) async {
+    c.options.options["--target"] = backendTarget;
+    c.options.options["--strong-mode"] = false;
     c.options.options["--packages"] = packages;
     if (verbose) {
       c.options.options["--verbose"] = true;
     }
     sdk ??= c.options.sdk;
 
     TranslateUri uriTranslator = await TranslateUri.parse(c.fileSystem, sdk,
         packages: c.options.packages);
     ticker.logMs("Read packages file");
-    DillTarget dillTarget = new DillTarget(ticker, uriTranslator,
-        getTarget(backendTarget, new TargetFlags(strongMode: false)));
+    DillTarget dillTarget =
+        new DillTarget(ticker, uriTranslator, c.options.target);
     _appendDillForUri(dillTarget, platform);
     KernelTarget kernelTarget = new KernelTarget(
         PhysicalFileSystem.instance, dillTarget, uriTranslator, c.uriToSource);
 
     kernelTarget.read(script);
     await dillTarget.buildOutlines();
     await kernelTarget.loader.buildOutlines();
     await kernelTarget.writeDepsFile(output, depsFile,
         extraDependencies: extraDependencies);
   });
@@ skipping 13 matching lines @@
   final BytesBuilder builder = new BytesBuilder();
 
   void add(List<int> data) {
     builder.add(data);
   }
 
   void close() {
     // Nothing to do.
   }
 }