| Index: tests/compiler/dart2js/kernel/compile_from_dill_test.dart
|
| diff --git a/tests/compiler/dart2js/kernel/compile_from_dill_test.dart b/tests/compiler/dart2js/kernel/compile_from_dill_test.dart
|
| index 22bd53a8605f772a129ff61869c8660c81805c7a..bfcea5063d57324972b7d6ad8867e7fc311deedf 100644
|
| --- a/tests/compiler/dart2js/kernel/compile_from_dill_test.dart
|
| +++ b/tests/compiler/dart2js/kernel/compile_from_dill_test.dart
|
| @@ -2,34 +2,15 @@
|
| // 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.
|
|
|
| -// Partial test that the closed world computed from [WorldImpact]s derived from
|
| -// kernel is equivalent to the original computed from resolution.
|
| +// Test compilation equivalence between source and .dill based
|
| +// compilation using the default emitter (full_emitter).
|
| library dart2js.kernel.compile_from_dill_test;
|
|
|
| import 'dart:async';
|
| -import 'dart:io';
|
| -
|
| import 'package:async_helper/async_helper.dart';
|
| -import 'package:compiler/compiler_new.dart';
|
| -import 'package:compiler/src/commandline_options.dart';
|
| -import 'package:compiler/src/common.dart';
|
| -import 'package:compiler/src/compiler.dart';
|
| -import 'package:compiler/src/elements/elements.dart';
|
| -import 'package:compiler/src/elements/types.dart';
|
| -import 'package:compiler/src/kernel/element_map.dart';
|
| -import 'package:compiler/src/kernel/kernel_strategy.dart';
|
| -import 'package:compiler/src/serialization/equivalence.dart';
|
| -import 'package:compiler/src/resolution/enum_creator.dart';
|
| -import 'package:compiler/src/universe/world_builder.dart';
|
| -import 'package:compiler/src/world.dart';
|
| -import 'package:expect/expect.dart';
|
| -import '../memory_compiler.dart';
|
| -import '../equivalence/check_functions.dart';
|
| -import '../equivalence/check_helpers.dart';
|
| import '../serialization/helper.dart';
|
| -import 'test_helpers.dart';
|
|
|
| -import 'compiler_helper.dart';
|
| +import 'compile_from_dill_test_helper.dart';
|
|
|
| const SOURCE = const {
|
| 'main.dart': '''
|
| @@ -64,8 +45,6 @@ main(List<String> args) {
|
| });
|
| }
|
|
|
| -enum ResultKind { crashes, errors, warnings, success, failure }
|
| -
|
| Future<ResultKind> mainInternal(List<String> args,
|
| {bool skipWarnings: false, bool skipErrors: false}) async {
|
| Arguments arguments = new Arguments.from(args);
|
| @@ -79,124 +58,8 @@ Future<ResultKind> mainInternal(List<String> args,
|
| memorySourceFiles = SOURCE;
|
| }
|
|
|
| - enableDebugMode();
|
| - EnumCreator.matchKernelRepresentationForTesting = true;
|
| - Elements.usePatchedDart2jsSdkSorting = true;
|
| -
|
| - Directory dir = await Directory.systemTemp.createTemp('dart2js-with-dill');
|
| - print('--- create temp directory $dir -------------------------------');
|
| - memorySourceFiles.forEach((String name, String source) {
|
| - new File.fromUri(dir.uri.resolve(name)).writeAsStringSync(source);
|
| - });
|
| - entryPoint = dir.uri.resolve(entryPoint.path);
|
| -
|
| - print('---- compile from ast ----------------------------------------------');
|
| - DiagnosticCollector collector = new DiagnosticCollector();
|
| - OutputCollector collector1 = new OutputCollector();
|
| - Compiler compiler1 = compilerFor(
|
| - entryPoint: entryPoint,
|
| - diagnosticHandler: collector,
|
| - outputProvider: collector1,
|
| - options: [
|
| - Flags.disableTypeInference,
|
| - Flags.disableInlining,
|
| - Flags.enableAssertMessage
|
| - ]);
|
| - ElementResolutionWorldBuilder.useInstantiationMap = true;
|
| - compiler1.resolution.retainCachesForTesting = true;
|
| - await compiler1.run(entryPoint);
|
| - if (collector.crashes.isNotEmpty) {
|
| - print('Skipping due to crashes.');
|
| - return ResultKind.crashes;
|
| - }
|
| - if (collector.errors.isNotEmpty && skipErrors) {
|
| - print('Skipping due to errors.');
|
| - return ResultKind.errors;
|
| - }
|
| - if (collector.warnings.isNotEmpty && skipWarnings) {
|
| - print('Skipping due to warnings.');
|
| - return ResultKind.warnings;
|
| - }
|
| - Expect.isFalse(compiler1.compilationFailed);
|
| - ClosedWorld closedWorld1 =
|
| - compiler1.resolutionWorldBuilder.closedWorldForTesting;
|
| -
|
| - OutputCollector collector2 = new OutputCollector();
|
| - Compiler compiler2 = await compileWithDill(
|
| - entryPoint,
|
| - const {},
|
| - [
|
| - Flags.disableTypeInference,
|
| - Flags.disableInlining,
|
| - Flags.enableAssertMessage
|
| - ],
|
| - printSteps: true,
|
| - compilerOutput: collector2);
|
| -
|
| - KernelFrontEndStrategy frontendStrategy = compiler2.frontendStrategy;
|
| - KernelToElementMap elementMap = frontendStrategy.elementMap;
|
| -
|
| - Expect.isFalse(compiler2.compilationFailed);
|
| -
|
| - KernelEquivalence equivalence = new KernelEquivalence(elementMap);
|
| -
|
| - ClosedWorld closedWorld2 =
|
| - compiler2.resolutionWorldBuilder.closedWorldForTesting;
|
| -
|
| - checkBackendUsage(closedWorld1.backendUsage, closedWorld2.backendUsage,
|
| - equivalence.defaultStrategy);
|
| -
|
| - print('--- checking resolution enqueuers ----------------------------------');
|
| - checkResolutionEnqueuers(closedWorld1.backendUsage, closedWorld2.backendUsage,
|
| - compiler1.enqueuer.resolution, compiler2.enqueuer.resolution,
|
| - elementEquivalence: (a, b) => equivalence.entityEquivalence(a, b),
|
| - typeEquivalence: (DartType a, DartType b) {
|
| - return equivalence.typeEquivalence(unalias(a), b);
|
| - },
|
| - elementFilter: elementFilter,
|
| - verbose: arguments.verbose);
|
| -
|
| - print('--- checking closed worlds -----------------------------------------');
|
| - checkClosedWorlds(closedWorld1, closedWorld2,
|
| - strategy: equivalence.defaultStrategy,
|
| + return runTest(entryPoint, memorySourceFiles,
|
| verbose: arguments.verbose,
|
| - // TODO(johnniwinther,efortuna): Require closure class equivalence when
|
| - // these are supported.
|
| - allowMissingClosureClasses: true);
|
| -
|
| - // TODO(johnniwinther): Perform equivalence tests on the model: codegen world
|
| - // impacts, program model, etc.
|
| -
|
| - print('--- checking codegen enqueuers--------------------------------------');
|
| - checkCodegenEnqueuers(compiler1.enqueuer.codegenEnqueuerForTesting,
|
| - compiler2.enqueuer.codegenEnqueuerForTesting,
|
| - elementEquivalence: (a, b) => equivalence.entityEquivalence(a, b),
|
| - typeEquivalence: (DartType a, DartType b) {
|
| - return equivalence.typeEquivalence(unalias(a), b);
|
| - },
|
| - elementFilter: elementFilter,
|
| - verbose: arguments.verbose);
|
| -
|
| - checkEmitters(compiler1.backend.emitter, compiler2.backend.emitter,
|
| - elementEquivalence: (a, b) => equivalence.entityEquivalence(a, b),
|
| - typeEquivalence: (DartType a, DartType b) {
|
| - return equivalence.typeEquivalence(unalias(a), b);
|
| - },
|
| - verbose: arguments.verbose);
|
| -
|
| - print('--- checking output------- -----------------------------------------');
|
| - collector1.outputMap
|
| - .forEach((OutputType outputType, Map<String, BufferedOutputSink> map1) {
|
| - if (outputType == OutputType.sourceMap) {
|
| - // TODO(johnniwinther): Support source map from .dill.
|
| - return;
|
| - }
|
| - Map<String, BufferedOutputSink> map2 = collector2.outputMap[outputType];
|
| - checkSets(map1.keys, map2.keys, 'output', equality);
|
| - map1.forEach((String name, BufferedOutputSink output1) {
|
| - BufferedOutputSink output2 = map2[name];
|
| - Expect.stringEquals(output1.text, output2.text);
|
| - });
|
| - });
|
| - return ResultKind.success;
|
| + skipWarnings: skipWarnings,
|
| + skipErrors: skipErrors);
|
| }
|
|
|