| Index: tests/compiler/dart2js/kernel/impact_test.dart
|
| diff --git a/tests/compiler/dart2js/kernel/impact_test.dart b/tests/compiler/dart2js/kernel/impact_test.dart
|
| index 1b63ddb6377e87741d27a1275cedcf3860ab279c..b06a48e05e503fbec135528d3dc591ac786eb850 100644
|
| --- a/tests/compiler/dart2js/kernel/impact_test.dart
|
| +++ b/tests/compiler/dart2js/kernel/impact_test.dart
|
| @@ -14,8 +14,8 @@ import 'package:compiler/src/constants/expressions.dart';
|
| import 'package:compiler/src/elements/elements.dart';
|
| import 'package:compiler/src/elements/resolution_types.dart';
|
| import 'package:compiler/src/js_backend/backend.dart';
|
| -import 'package:compiler/src/kernel/element_adapter.dart';
|
| import 'package:compiler/src/kernel/element_map.dart';
|
| +import 'package:compiler/src/kernel/element_map_impl.dart';
|
| import 'package:compiler/src/resolution/registry.dart';
|
| import 'package:compiler/src/resolution/tree_elements.dart';
|
| import 'package:compiler/src/ssa/kernel_impact.dart';
|
| @@ -740,8 +740,8 @@ main(List<String> args) {
|
| compiler.resolution.retainCachesForTesting = true;
|
| Expect.isTrue(await compiler.run(entryPoint));
|
| JavaScriptBackend backend = compiler.backend;
|
| - KernelToElementMap kernelElementMap =
|
| - new KernelToElementMap(compiler.reporter, compiler.environment);
|
| + KernelToElementMapImpl kernelElementMap =
|
| + new KernelToElementMapImpl(compiler.reporter, compiler.environment);
|
| kernelElementMap.addProgram(backend.kernelTask.program);
|
|
|
| checkLibrary(compiler, kernelElementMap, compiler.mainApp,
|
| @@ -753,26 +753,25 @@ main(List<String> args) {
|
| });
|
| }
|
|
|
| -void checkLibrary(Compiler compiler, KernelElementAdapter kernelElementAdapter,
|
| +void checkLibrary(Compiler compiler, KernelToElementMapMixin elementMap,
|
| LibraryElement library,
|
| {bool fullTest: false}) {
|
| library.forEachLocalMember((AstElement element) {
|
| if (element.isClass) {
|
| ClassElement cls = element;
|
| cls.forEachLocalMember((AstElement member) {
|
| - checkElement(compiler, kernelElementAdapter, member,
|
| - fullTest: fullTest);
|
| + checkElement(compiler, elementMap, member, fullTest: fullTest);
|
| });
|
| } else if (element.isTypedef) {
|
| // Skip typedefs.
|
| } else {
|
| - checkElement(compiler, kernelElementAdapter, element, fullTest: fullTest);
|
| + checkElement(compiler, elementMap, element, fullTest: fullTest);
|
| }
|
| });
|
| }
|
|
|
| -void checkElement(Compiler compiler, KernelElementAdapter kernelElementAdapter,
|
| - AstElement element,
|
| +void checkElement(
|
| + Compiler compiler, KernelToElementMapMixin elementMap, AstElement element,
|
| {bool fullTest: false}) {
|
| if (!fullTest && element.library.isPlatformLibrary) {
|
| return;
|
| @@ -794,12 +793,11 @@ void checkElement(Compiler compiler, KernelElementAdapter kernelElementAdapter,
|
| ResolutionImpact kernelImpact1 = build(compiler, element.resolvedAst);
|
| ir.Member member = getIrMember(compiler, element.resolvedAst);
|
| Expect.isNotNull(kernelImpact1, 'No impact computed for $element');
|
| - ResolutionImpact kernelImpact2 =
|
| - buildKernelImpact(member, kernelElementAdapter);
|
| + ResolutionImpact kernelImpact2 = buildKernelImpact(member, elementMap);
|
| Expect.isNotNull(kernelImpact2, 'No impact computed for $member');
|
| testResolutionImpactEquivalence(astImpact, kernelImpact1,
|
| strategy: const CheckStrategy());
|
| - KernelEquivalence equivalence = new KernelEquivalence(kernelElementAdapter);
|
| + KernelEquivalence equivalence = new KernelEquivalence(elementMap);
|
| testResolutionImpactEquivalence(astImpact, kernelImpact2,
|
| strategy: new CheckStrategy(
|
| elementEquivalence: equivalence.entityEquivalence,
|
|
|