Add a --cps-ir flag to the testing script to allow us to run with the new cps based backend in dart…

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
@@ skipping 42 matching lines @@
     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 isHostChecked = configuration['host_checked'];
     bool useSdk = configuration['use_sdk'];
     bool isCsp = configuration['csp'];
+    bool useCps = configuration['cps_ir'];
 
     switch (compiler) {
       case 'dartanalyzer':
         return new AnalyzerCompilerConfiguration(
             'dartanalyzer', isDebug: isDebug, isChecked: isChecked,
             isHostChecked: isHostChecked, useSdk: useSdk);
       case 'dart2analyzer':
         return new DartBasedAnalyzerCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked,
             isHostChecked: isHostChecked, useSdk: useSdk);
       case 'dart2js':
         return new Dart2jsCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked,
-            isHostChecked: isHostChecked, useSdk: useSdk, isCsp: isCsp,
-            extraDart2jsOptions:
+            isHostChecked: isHostChecked, useCps: useCps, useSdk: useSdk,
+            isCsp: isCsp, extraDart2jsOptions:
                 TestUtils.getExtraOptions(configuration, 'dart2js_options'));
       case 'dart2dart':
         return new Dart2dartCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked,
             isHostChecked: isHostChecked, useSdk: useSdk);
       case 'none':
         return new NoneCompilerConfiguration(
             isDebug: isDebug, isChecked: isChecked,
             isHostChecked: isHostChecked, useSdk: useSdk);
       default:
@@ skipping 130 matching lines @@
     if (!useSdk) return const <Uri>[];
     return _bootstrapDependenciesCache.putIfAbsent(buildDir, () =>
       [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 List<String> extraDart2jsOptions;
 
   Dart2jsCompilerConfiguration({
       bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk,
+      bool this.useCps,
       bool this.isCsp,
       this.extraDart2jsOptions})
       : super(
           'dart2js',
           isDebug: isDebug, isChecked: isChecked,
           isHostChecked: isHostChecked, useSdk: useSdk);
 
   int computeTimeoutMultiplier() {
     int multiplier = 1;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     if (isHostChecked) multiplier *= 16;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
+    var env = environmentOverrides;
+    if (useCps) {
+      var vmoption = { 'DART_VM_OPTIONS' : '-DUSE_CPS_IR=true' };

[Bill Hesse, 2015/04/14 11:42:33]

We do actually have a small problem with the memory usage of these objects, so
it might actually be significant to create new objects every time.  A cache
(lookup from the original environmentOverrides object, by object identity, to
the modified map) could be worthwhile.

If you just put this in a function environmentPlusUseCps(environmentOverrides),
then it could be easier to do this.

+      env = {}..addAll(environmentOverrides)..addAll(vmoption);

[karlklose, 2015/04/14 08:56:03]

Shouldn't this be 'env.addAll(...)' to preserve other overrides?

[ricow1, 2015/04/14 08:59:10]

I don preserve other overriddes, since I addAll environmentOverrides

+    }
     return new CommandArtifact(
         <Command>[
             this.computeCompilationCommand(
                 '$tempDir/out.js',
                 buildDir,
                 CommandBuilder.instance,
                 []..addAll(arguments)..addAll(extraDart2jsOptions),
-                environmentOverrides)],
+                env)],
         '$tempDir/out.js',
         'application/javascript');
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
@@ skipping 129 matching lines @@
       // shipped SDK, that is the script is not installed in
       // "$buildDir/dart-sdk/bin/"
       return '$prefix/dartanalyzer_developer$suffix';
     }
     if (useSdk) {
       prefix = '$buildDir/dart-sdk/bin';
     }
     return '$prefix/dartanalyzer$suffix';
   }
 }