Rework DillLoader to allow adding multiple dills.

pkg/kernel/test/closures/suite.dart

 // 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;
 
 import 'dart:async' show Future;
 
 import 'package:front_end/physical_file_system.dart';
 import 'package:testing/testing.dart'
@@ skipping 42 matching lines @@
           const Verify(true),
           new MatchExpectation(".expect",
               updateExpectations: updateExpectations),
           const WriteDill(),
           const ReadDill(),
           // TODO(29143): add `Run` step when Vectors are added to VM.
         ];
 
   Future<Program> loadPlatform() async {
     Uri sdk = await computePatchedSdk();
-    return loadProgramFromBinary(sdk.resolve('platform.dill').toFilePath());
+    String platformPath = sdk.resolve('platform.dill').toFilePath();
+    return loadProgramFromBinary(platformPath);

[ahe, 2017/05/11 10:09:49]

Why this change?

[scheglov, 2017/05/11 15:53:11]

I will roll this back.

   }
 
   static Future<ClosureConversionContext> create(
       Chain suite, Map<String, String> environment) async {
     Uri packages = Uri.base.resolve(".packages");
     bool strongMode = environment.containsKey(STRONG_MODE);
     bool updateExpectations = environment["updateExpectations"] == "true";
     TranslateUri uriTranslator =
         await TranslateUri.parse(PhysicalFileSystem.instance, packages);
     return new ClosureConversionContext(
@@ skipping 12 matching lines @@
     extends Step<TestDescription, Program, ClosureConversionContext> {
   const FastaCompile();
 
   String get name => "fasta compilation";
 
   Future<Result<Program>> run(
       TestDescription description, ClosureConversionContext context) async {
     Program platform = await context.loadPlatform();
     Ticker ticker = new Ticker();
     DillTarget dillTarget = new DillTarget(ticker, context.uriTranslator);
-    dillTarget.loader
-      ..input = Uri.parse("org.dartlang:platform") // Make up a name.
-      ..setProgram(platform);
+    dillTarget.loader.appendLibraries(platform);
     KernelTarget sourceTarget = new KernelTarget(PhysicalFileSystem.instance,
         dillTarget, context.uriTranslator, context.strongMode);
 
     Program p;
     try {
       sourceTarget.read(description.uri);
       await dillTarget.writeOutline(null);
       await sourceTarget.writeOutline(null);
       p = await sourceTarget.writeProgram(null);
     } on InputError catch (e, s) {
@@ skipping 14 matching lines @@
     try {
       program = closure_conversion.transformProgram(program);
       return pass(program);
     } catch (e, s) {
       return crash(e, s);
     }
   }
 }
 
 main(List<String> arguments) => runMe(arguments, createContext, "testing.json");