| 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 bf5e147ba022f081a9609aad9f048297d369d462..5e1c667dd389a608634f41e4a2f720c263a24928 100644
|
| --- a/tests/compiler/dart2js/serialization/model_test_helper.dart
|
| +++ b/tests/compiler/dart2js/serialization/model_test_helper.dart
|
| @@ -107,7 +107,8 @@ Future checkModels(Uri entryPoint,
|
|
|
| void checkResolutionEnqueuers(
|
| ResolutionEnqueuer enqueuer1, ResolutionEnqueuer enqueuer2,
|
| - {bool typeEquivalence(DartType a, DartType b): areTypesEquivalent,
|
| + {bool typeEquivalence(ResolutionDartType a, ResolutionDartType b):
|
| + areTypesEquivalent,
|
| bool elementFilter(Element element),
|
| bool verbose: false}) {
|
| checkSets(enqueuer1.processedEntities, enqueuer2.processedEntities,
|
| @@ -424,8 +425,10 @@ void checkOutputUnits(
|
| (a, b) => areElementsEquivalent(a.declaration, b.declaration));
|
| }
|
|
|
| -bool areInstantiationInfosEquivalent(InstantiationInfo info1,
|
| - InstantiationInfo info2, bool typeEquivalence(DartType a, DartType b)) {
|
| +bool areInstantiationInfosEquivalent(
|
| + InstantiationInfo info1,
|
| + InstantiationInfo info2,
|
| + bool typeEquivalence(ResolutionDartType a, ResolutionDartType b)) {
|
| checkMaps(
|
| info1.instantiationMap,
|
| info2.instantiationMap,
|
| @@ -438,7 +441,7 @@ bool areInstantiationInfosEquivalent(InstantiationInfo info1,
|
| }
|
|
|
| bool areInstancesEquivalent(Instance instance1, Instance instance2,
|
| - bool typeEquivalence(DartType a, DartType b)) {
|
| + bool typeEquivalence(ResolutionDartType a, ResolutionDartType b)) {
|
| return typeEquivalence(instance1.type, instance2.type) &&
|
| instance1.kind == instance2.kind &&
|
| instance1.isRedirection == instance2.isRedirection;
|
|
|