| Index: pkg/front_end/lib/src/fasta/testing/kernel_chain.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart b/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart
|
| index 1e16464b42a0aa40a3a5d0fd153edcbfe2bc3ede..4a27a149ecfbe7b68b7abe3226b351f12a7eed86 100644
|
| --- a/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart
|
| +++ b/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart
|
| @@ -20,7 +20,6 @@ import 'dart:typed_data' show
|
| Uint8List;
|
|
|
| import 'package:kernel/kernel.dart' show
|
| - Repository,
|
| loadProgramFromBinary;
|
|
|
| import 'package:kernel/text/ast_to_text.dart' show
|
| @@ -44,9 +43,6 @@ import 'package:kernel/binary/ast_to_binary.dart' show
|
| import 'package:kernel/binary/ast_from_binary.dart' show
|
| BinaryBuilder;
|
|
|
| -import 'package:kernel/binary/loader.dart' show
|
| - BinaryLoader;
|
| -
|
| import 'package:analyzer/src/generated/sdk.dart' show
|
| DartSdk;
|
|
|
| @@ -60,9 +56,6 @@ import 'package:kernel/target/targets.dart' show
|
| TargetFlags,
|
| getTarget;
|
|
|
| -import 'package:kernel/repository.dart' show
|
| - Repository;
|
| -
|
| import 'package:testing/testing.dart' show
|
| Chain,
|
| ChainContext,
|
| @@ -143,8 +136,8 @@ abstract class TestContext extends ChainContext {
|
| packagePath: packages.toFilePath());
|
|
|
| Future<DartLoader> createLoader() async {
|
| - Repository repository = new Repository();
|
| - return new DartLoader(repository, options, await loadPackagesFile(packages),
|
| + Program program = new Program();
|
| + return new DartLoader(program, options, await loadPackagesFile(packages),
|
| ignoreRedirectingFactories: false, dartSdk: dartSdk);
|
| }
|
|
|
| @@ -173,8 +166,8 @@ class Kernel extends Step<TestDescription, Program, TestContext> {
|
| DartLoader loader = await testContext.createLoader();
|
| Target target = getTarget(
|
| "vm", new TargetFlags(strongMode: testContext.options.strongMode));
|
| - Program program =
|
| - loader.loadProgram(description.uri, target: target);
|
| + loader.loadProgram(description.uri, target: target);
|
| + Program program = loader.program;
|
| for (var error in loader.errors) {
|
| return fail(program, "$error");
|
| }
|
| @@ -280,6 +273,7 @@ class WriteDill extends Step<Program, Uri, TestContext> {
|
| IOSink sink = generated.openWrite();
|
| try {
|
| new BinaryPrinter(sink).writeProgramFile(program);
|
| + program.unbindCanonicalNames();
|
| } catch (e, s) {
|
| return fail(uri, e, s);
|
| } finally {
|
| @@ -313,9 +307,10 @@ class Copy extends Step<Program, Program, TestContext> {
|
| Future<Result<Program>> run(Program program, _) async {
|
| BytesCollector sink = new BytesCollector();
|
| new BinaryPrinter(sink).writeProgramFile(program);
|
| + program.unbindCanonicalNames();
|
| Uint8List bytes = sink.collect();
|
| - BinaryLoader loader = new BinaryLoader(new Repository());
|
| - return pass(new BinaryBuilder(loader, bytes).readProgramFile());
|
| + new BinaryBuilder(bytes).readProgram(program);
|
| + return pass(program);
|
| }
|
| }
|
|
|
|
|