Merge the work on Generic Types Reification from 'dart-lang/reify' repo

pkg/kernel/test/reify/suite.dart

-// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
+// 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.md file.
 
-library test.kernel.closures.suite;
+library test.kernel.reify.suite;
 
 import 'dart:async' show Future;
 
 import 'dart:io' show Directory, File, Platform;
 
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
 
 import 'package:kernel/analyzer/loader.dart'
     show DartLoader, DartOptions, createDartSdk;
 
@@ skipping 12 matching lines @@
         StdioProcess,
         Step,
         TestDescription,
         runMe;
 
 import 'package:kernel/ast.dart' show Program;
 
 import 'package:kernel/transformations/closure_conversion.dart'
     as closure_conversion;
 
+import 'package:kernel/transformations/generic_types_reification.dart'
+    as generic_types_reification;
+
 import 'package:package_config/discovery.dart' show loadPackagesFile;
 
 class TestContext extends ChainContext {
   final Uri vm;
 
   final Uri packages;
 
   final DartOptions options;
 
   final DartSdk dartSdk;
 
   final List<Step> steps;
 
   TestContext(String sdk, this.vm, Uri packages, bool strongMode, this.dartSdk,
       bool updateExpectations)
       : packages = packages,
         options = new DartOptions(
             strongMode: strongMode,
             sdk: sdk,
             packagePath: packages.toFilePath()),
         steps = <Step>[
           const Kernel(),
           const Print(),
           const SanityCheck(),
           const ClosureConversion(),
+          const GenericTypesReification(),
           const Print(),
           const SanityCheck(),
           new MatchExpectation(".expect",
               updateExpectations: updateExpectations),
           const WriteDill(),
           const ReadDill(),
           const Run(),
         ];
 
   Future<DartLoader> createLoader() async {
@@ skipping 46 matching lines @@
   if (await fileExists(sdkUri, asyncSources)) {
     throw "Found '$asyncSources' in '$sdk', so it isn't a patched SDK. "
         "$suggestion";
   }
 
   // TODO(karlklose): select the VM based on the mode.
   Uri vm = Uri.base.resolve("out/ReleaseX64/dart");
 
   Uri packages = Uri.base.resolve(".packages");
   bool strongMode = false;
-  bool updateExpectations = environment["updateExpectations"] != "false";
+  bool updateExpectations = environment["updateExpectations"] == "true";
   return new TestContext(sdk, vm, packages, strongMode,
       createDartSdk(sdk, strongMode: strongMode), updateExpectations);
 }
 
 class Kernel extends Step<TestDescription, Program, TestContext> {
   const Kernel();
 
   String get name => "kernel";
 
   Future<Result<Program>> run(
       TestDescription description, TestContext testContext) async {
     try {
       DartLoader loader = await testContext.createLoader();
+
       Target target = getTarget(
           "vm", new TargetFlags(strongMode: testContext.options.strongMode));
+      // reifyTarget is used to add the GTR-specific runtime libraries
+      // when the program is being loaded
+      Target reifyTarget = getTarget(
+          "vmreify",
+          new TargetFlags(
+              strongMode: testContext.options.strongMode,
+              kernelRuntime: Platform.script.resolve('../../runtime/')));
+
       String path = description.file.path;
       Uri uri = Uri.base.resolve(path);
-      Program program = loader.loadProgram(uri, target: target);
+      Program program = loader.loadProgram(uri, target: reifyTarget);
       for (var error in loader.errors) {
         return fail(program, "$error");
       }
       target
         ..performModularTransformations(program)
         ..performGlobalTransformations(program);
       return pass(program);
     } catch (e, s) {
       return crash(e, s);
     }
   }
 }
 
 class ClosureConversion extends Step<Program, Program, TestContext> {
   const ClosureConversion();
 
   String get name => "closure conversion";
 
   Future<Result<Program>> run(Program program, TestContext testContext) async {
     try {
       program = closure_conversion.transformProgram(program);
       return pass(program);
     } catch (e, s) {
       return crash(e, s);
     }
   }
 }
 
+class GenericTypesReification extends Step<Program, Program, TestContext> {
+  const GenericTypesReification();
+
+  String get name => "generic types reification";
+
+  Future<Result<Program>> run(Program program, TestContext testContext) async {
+    try {
+      program = generic_types_reification.transformProgram(program);
+      return pass(program);
+    } catch (e, s) {
+      return crash(e, s);
+    }
+  }
+}
+
 class Run extends Step<Uri, int, TestContext> {
   const Run();
 
   String get name => "run";
 
   Future<Result<int>> run(Uri uri, TestContext context) async {
     File generated = new File.fromUri(uri);
     StdioProcess process;
     try {
-      process = await StdioProcess
-          .run(context.vm.toFilePath(), [generated.path, "Hello, World!"]);
+      process =
+          await StdioProcess.run(context.vm.toFilePath(), [generated.path]);
       print(process.output);
     } finally {
       generated.parent.delete(recursive: true);
     }
     return process.toResult();
   }
 }
 
 main(List<String> arguments) => runMe(arguments, createContext, "testing.json");