| Index: tests/compiler/dart2js/serialization/model_test_helper.dart
|
| diff --git a/tests/compiler/dart2js/serialization/model_test_helper.dart b/tests/compiler/dart2js/serialization/model_test_helper.dart
|
| index e6cdc5a3bb9b8997648e5309c1d7f39f7c258bc1..ee18792ce5408a2b3d111906471f2a3083b30b16 100644
|
| --- a/tests/compiler/dart2js/serialization/model_test_helper.dart
|
| +++ b/tests/compiler/dart2js/serialization/model_test_helper.dart
|
| @@ -122,21 +122,14 @@ void checkResolutionEnqueuers(
|
| bool typeEquivalence(DartType a, DartType b): areTypesEquivalent,
|
| bool elementFilter(Element element),
|
| bool verbose: false}) {
|
| - checkSets(enqueuer1.processedEntities, enqueuer2.processedEntities,
|
| - "Processed element mismatch", elementEquivalence, elementFilter: (e) {
|
| - return elementFilter != null ? elementFilter(e) : true;
|
| - }, verbose: verbose);
|
| -
|
| ResolutionWorldBuilderBase worldBuilder1 = enqueuer1.worldBuilder;
|
| ResolutionWorldBuilderBase worldBuilder2 = enqueuer2.worldBuilder;
|
|
|
| - checkMaps(
|
| - worldBuilder1.getInstantiationMap(),
|
| - worldBuilder2.getInstantiationMap(),
|
| - "Instantiated classes mismatch",
|
| - elementEquivalence,
|
| - (a, b) => areInstantiationInfosEquivalent(
|
| - a, b, elementEquivalence, typeEquivalence),
|
| + checkSets(
|
| + enqueuer1.worldBuilder.instantiatedTypes,
|
| + enqueuer2.worldBuilder.instantiatedTypes,
|
| + "Instantiated types mismatch",
|
| + typeEquivalence,
|
| verbose: verbose);
|
|
|
| checkSets(
|
| @@ -146,13 +139,20 @@ void checkResolutionEnqueuers(
|
| elementEquivalence,
|
| verbose: verbose);
|
|
|
| - checkSets(
|
| - enqueuer1.worldBuilder.instantiatedTypes,
|
| - enqueuer2.worldBuilder.instantiatedTypes,
|
| - "Instantiated types mismatch",
|
| - typeEquivalence,
|
| + checkMaps(
|
| + worldBuilder1.getInstantiationMap(),
|
| + worldBuilder2.getInstantiationMap(),
|
| + "Instantiated classes mismatch",
|
| + elementEquivalence,
|
| + (a, b) => areInstantiationInfosEquivalent(
|
| + a, b, elementEquivalence, typeEquivalence),
|
| verbose: verbose);
|
|
|
| + checkSets(enqueuer1.processedEntities, enqueuer2.processedEntities,
|
| + "Processed element mismatch", elementEquivalence, elementFilter: (e) {
|
| + return elementFilter != null ? elementFilter(e) : true;
|
| + }, verbose: verbose);
|
| +
|
| checkSets(enqueuer1.worldBuilder.isChecks, enqueuer2.worldBuilder.isChecks,
|
| "Is-check mismatch", typeEquivalence,
|
| verbose: verbose);
|
|
|