Revert "Revert "Revert "Refactor test option parsing code."""

tools/testing/dart/compiler_configuration.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.
 
 library compiler_configuration;
 
 import 'dart:io' show Platform;
 
 import 'runtime_configuration.dart' show RuntimeConfiguration;
 import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
@@ skipping 29 matching lines @@
   return (path == '' || path.endsWith('/')) ? uri : Uri.parse('$uri/');
 }
 
 abstract class CompilerConfiguration {
   final bool isDebug;
   final bool isChecked;
   final bool isStrong;
   final bool isHostChecked;
   final bool useSdk;
 
-  /// Only some subclasses support this check, but we statically allow calling
-  /// it on [CompilerConfiguration].
-  bool get useDfe {
-    throw new UnsupportedError("This compiler does not support DFE.");
-  }
-
   // TODO(ahe): Remove this constructor and move the switch to
   // test_options.dart.  We probably want to store an instance of
   // [CompilerConfiguration] in [configuration] there.
   factory CompilerConfiguration(Map configuration) {
     String compiler = configuration['compiler'];
 
     // TODO(ahe): Move these booleans into a struction configuration object
     // which can eventually completely replace the Map-based configuration
     // object.
     bool isDebug = configuration['mode'] == 'debug';
     bool isChecked = configuration['checked'];
     bool isStrong = configuration['strong'];
     bool isHostChecked = configuration['host_checked'];
     bool useSdk = configuration['use_sdk'];
     bool isCsp = configuration['csp'];
+    bool useCps = configuration['cps_ir'];
     bool useBlobs = configuration['use_blobs'];
     bool hotReload = configuration['hot_reload'];
     bool hotReloadRollback = configuration['hot_reload_rollback'];
     bool useFastStartup = configuration['fast_startup'];
     bool useKernelInDart2js = configuration['dart2js_with_kernel'];
 
     switch (compiler) {
       case 'dart2analyzer':
         return new AnalyzerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isStrong: isStrong,
             isHostChecked: isHostChecked,
             useSdk: useSdk);
       case 'dart2js':
         return new Dart2jsCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
+            useCps: useCps,
             useSdk: useSdk,
             isCsp: isCsp,
             useFastStartup: useFastStartup,
             useKernel: useKernelInDart2js,
             extraDart2jsOptions:
                 TestUtils.getExtraOptions(configuration, 'dart2js_options'));
       case 'app_jit':
         return new AppJitCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked);
       case 'precompiler':
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             arch: configuration['arch'],
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android');
       case 'dartk':
         return new NoneCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk,
             hotReload: hotReload,
             hotReloadRollback: hotReloadRollback,
-            useDfe: true);
+            useDFE: true);
       case 'dartkp':
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             arch: configuration['arch'],
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android',
-            useDfe: true);
+            useDFE: true);
       case 'none':
         return new NoneCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk,
             hotReload: hotReload,
             hotReloadRollback: hotReloadRollback);
       default:
         throw "Unknown compiler '$compiler'";
@@ skipping 51 matching lines @@
       List<String> originalArguments,
       CommandArtifact artifact) {
     return [artifact.filename];
   }
 }
 
 /// The "none" compiler.
 class NoneCompilerConfiguration extends CompilerConfiguration {
   final bool hotReload;
   final bool hotReloadRollback;
-  final bool useDfe;
+  final bool useDFE;
 
   NoneCompilerConfiguration(
       {bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk,
       bool this.hotReload,
       bool this.hotReloadRollback,
-      this.useDfe: false})
+      this.useDFE: false})
       : super._subclass(
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk);
 
   bool get hasCompiler => false;
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     List<String> args = [];
-    if (useDfe) {
+    if (useDFE) {
       args.add('--dfe=${buildDir}/gen/kernel-service.dart.snapshot');
       args.add('--platform=${buildDir}/patched_sdk/platform.dill');
     }
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
     if (hotReload) {
       args.add('--hot-reload-test-mode');
     } else if (hotReloadRollback) {
@@ skipping 302 matching lines @@
               Uri.base
                   .resolveUri(nativeDirectoryToUri(buildDir))
                   .resolve('dart-sdk/bin/snapshots/dart2js.dart.snapshot')
             ]);
   }
 }
 
 /// Configuration for dart2js compiler.
 class Dart2jsCompilerConfiguration extends Dart2xCompilerConfiguration {
   final bool isCsp;
+  final bool useCps;
   final bool useFastStartup;
   final bool useKernel;
   final List<String> extraDart2jsOptions;
+  // We cache the extended environment to save memory.
+  static Map<String, String> cpsFlagCache;
+  static Map<String, String> environmentOverridesCacheObject;
 
   Dart2jsCompilerConfiguration(
       {bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk,
+      bool this.useCps,
       bool this.isCsp,
       bool this.useFastStartup,
       this.useKernel,
       this.extraDart2jsOptions})
       : super('dart2js',
             isDebug: isDebug,
             isChecked: isChecked,
             isHostChecked: isHostChecked,
             useSdk: useSdk);
 
@@ skipping 33 matching lines @@
     Uri preambleDir = sdk.resolve('lib/_internal/js_runtime/lib/preambles/');
     return runtimeConfiguration.dart2jsPreambles(preambleDir)
       ..add(artifact.filename);
   }
 }
 
 class PrecompilerCompilerConfiguration extends CompilerConfiguration {
   final String arch;
   final bool useBlobs;
   final bool isAndroid;
-  final bool useDfe;
+  final bool useDFE;
 
   PrecompilerCompilerConfiguration(
       {bool isDebug,
       bool isChecked,
       this.arch,
       this.useBlobs,
       this.isAndroid,
-      this.useDfe: false})
+      this.useDFE: false})
       : super._subclass(isDebug: isDebug, isChecked: isChecked);
 
   int computeTimeoutMultiplier() {
     int multiplier = 2;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
@@ skipping 25 matching lines @@
     if (isAndroid) {
       if (arch == "arm") {
         exec = "$buildDir/clang_x86/dart_bootstrap";
       } else if (arch == "arm64") {
         exec = "$buildDir/clang_x64/dart_bootstrap";
       }
     } else {
       exec = "$buildDir/dart_bootstrap";
     }
     var args = <String>[];
-    if (useDfe) {
+    if (useDFE) {
       args.add('--dfe=utils/kernel-service/kernel-service.dart');
       args.add('--platform=${buildDir}/patched_sdk/platform.dill');
     }
     args.add("--snapshot-kind=app-aot");
     if (useBlobs) {
       args.add("--snapshot=$tempDir/out.aotsnapshot");
       args.add("--use-blobs");
     } else {
       args.add("--snapshot=$tempDir/out.S");
     }
@@ skipping 285 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }