Add model test of CodegenWorldBuilder to compile_from_dill_test

tests/compiler/dart2js/equivalence/check_functions.dart

Index: tests/compiler/dart2js/equivalence/check_functions.dart
diff --git a/tests/compiler/dart2js/equivalence/check_functions.dart b/tests/compiler/dart2js/equivalence/check_functions.dart
index 638a9fd9ddc1d25643272b6f7d63e8fb11015ddd..bb44e570ab6efca466634b2ecac1377556cd5ea4 100644
--- a/tests/compiler/dart2js/equivalence/check_functions.dart
+++ b/tests/compiler/dart2js/equivalence/check_functions.dart
@@ -15,6 +15,7 @@ import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/enqueue.dart';
 import 'package:compiler/src/js_backend/backend_usage.dart';
+import 'package:compiler/src/js_backend/enqueuer.dart';
 import 'package:compiler/src/js_backend/native_data.dart';
 import 'package:compiler/src/js_backend/interceptor_data.dart';
 import 'package:compiler/src/serialization/equivalence.dart';
@@ -627,16 +628,13 @@ void checkResolutionEnqueuers(
   ResolutionWorldBuilderBase worldBuilder1 = enqueuer1.worldBuilder;
   ResolutionWorldBuilderBase worldBuilder2 = enqueuer2.worldBuilder;
 
-  checkSets(
-      enqueuer1.worldBuilder.instantiatedTypes,
-      enqueuer2.worldBuilder.instantiatedTypes,
-      "Instantiated types mismatch",
-      typeEquivalence,
+  checkSets(worldBuilder1.instantiatedTypes, worldBuilder2.instantiatedTypes,
+      "Instantiated types mismatch", typeEquivalence,
       verbose: verbose);
 
   checkSets(
-      enqueuer1.worldBuilder.directlyInstantiatedClasses,
-      enqueuer2.worldBuilder.directlyInstantiatedClasses,
+      worldBuilder1.directlyInstantiatedClasses,
+      worldBuilder2.directlyInstantiatedClasses,
       "Directly instantiated classes mismatch",
       elementEquivalence,
       verbose: verbose);
@@ -655,8 +653,43 @@ void checkResolutionEnqueuers(
     return elementFilter != null ? elementFilter(e) : true;
   }, verbose: verbose);
 
-  checkSets(enqueuer1.worldBuilder.isChecks, enqueuer2.worldBuilder.isChecks,
-      "Is-check mismatch", typeEquivalence,
+  checkSets(worldBuilder1.isChecks, worldBuilder2.isChecks, "Is-check mismatch",
+      typeEquivalence,
+      verbose: verbose);
+
+  checkSets(worldBuilder1.closurizedMembers, worldBuilder2.closurizedMembers,
+      "closurizedMembers", elementEquivalence,
+      verbose: verbose);
+  checkSets(worldBuilder1.fieldSetters, worldBuilder2.fieldSetters,
+      "fieldSetters", elementEquivalence,
+      verbose: verbose);
+  checkSets(
+      worldBuilder1.methodsNeedingSuperGetter,
+      worldBuilder2.methodsNeedingSuperGetter,
+      "methodsNeedingSuperGetter",
+      elementEquivalence,
+      verbose: verbose);
+
+  checkMaps(
+      worldBuilder1.classUsageForTesting,
+      worldBuilder1.classUsageForTesting,

[Siggi Cherem (dart-lang), 2017/05/30 22:41:15]

worldBuilder2

[Johnni Winther, 2017/05/31 10:46:38]

You sure? ;)

+      'classUsageForTesting',
+      elementEquivalence,
+      equality,
+      verbose: verbose);
+  checkMaps(
+      worldBuilder1.staticMemberUsageForTesting,
+      worldBuilder1.staticMemberUsageForTesting,

[Siggi Cherem (dart-lang), 2017/05/30 22:41:15]

2

[Johnni Winther, 2017/05/31 10:46:38]

Done.

+      'staticMemberUsageForTesting',
+      elementEquivalence,
+      equality,
+      verbose: verbose);
+  checkMaps(
+      worldBuilder1.instanceMemberUsageForTesting,
+      worldBuilder1.instanceMemberUsageForTesting,

[Siggi Cherem (dart-lang), 2017/05/30 22:41:15]

2

[Johnni Winther, 2017/05/31 10:46:38]

Done.

+      'instanceMemberUsageForTesting',
+      elementEquivalence,
+      equality,
       verbose: verbose);
 
   Expect.equals(backendUsage1.isInvokeOnUsed, backendUsage2.isInvokeOnUsed,
@@ -672,3 +705,79 @@ void checkResolutionEnqueuers(
   Expect.equals(backendUsage1.isIsolateInUse, backendUsage2.isIsolateInUse,
       "JavaScriptBackend.hasIsolateSupport mismatch");
 }
+
+void checkCodegenEnqueuers(CodegenEnqueuer enqueuer1, CodegenEnqueuer enqueuer2,
+    {bool elementEquivalence(Entity a, Entity b): areElementsEquivalent,
+    bool typeEquivalence(DartType a, DartType b): areTypesEquivalent,
+    bool elementFilter(Element element),
+    bool verbose: false}) {
+  CodegenWorldBuilderImpl worldBuilder1 = enqueuer1.worldBuilder;
+  CodegenWorldBuilderImpl worldBuilder2 = enqueuer2.worldBuilder;
+
+  checkSets(worldBuilder1.instantiatedTypes, worldBuilder2.instantiatedTypes,
+      "Instantiated types mismatch", typeEquivalence,
+      verbose: verbose);
+
+  checkSets(
+      worldBuilder1.directlyInstantiatedClasses,
+      worldBuilder2.directlyInstantiatedClasses,
+      "Directly instantiated classes mismatch",
+      elementEquivalence,
+      verbose: verbose);
+
+  checkSets(enqueuer1.processedEntities, enqueuer2.processedEntities,
+      "Processed element mismatch", elementEquivalence, elementFilter: (e) {
+    return elementFilter != null ? elementFilter(e) : true;
+  }, verbose: verbose);
+
+  checkSets(worldBuilder1.isChecks, worldBuilder2.isChecks, "Is-check mismatch",
+      typeEquivalence,
+      verbose: verbose);
+
+  checkSets(
+      worldBuilder1.allReferencedStaticFields,
+      worldBuilder2.allReferencedStaticFields,
+      "Directly instantiated classes mismatch",
+      elementEquivalence,
+      verbose: verbose);
+  checkSets(worldBuilder1.closurizedMembers, worldBuilder2.closurizedMembers,
+      "closurizedMembers", elementEquivalence,
+      verbose: verbose);
+  checkSets(worldBuilder1.processedClasses, worldBuilder2.processedClasses,
+      "processedClasses", elementEquivalence,
+      verbose: verbose);
+  checkSets(
+      worldBuilder1.methodsNeedingSuperGetter,
+      worldBuilder2.methodsNeedingSuperGetter,
+      "methodsNeedingSuperGetter",
+      elementEquivalence,
+      verbose: verbose);
+  checkSets(
+      worldBuilder1.staticFunctionsNeedingGetter,
+      worldBuilder2.staticFunctionsNeedingGetter,
+      "staticFunctionsNeedingGetter",
+      elementEquivalence,
+      verbose: verbose);
+
+  checkMaps(
+      worldBuilder1.classUsageForTesting,
+      worldBuilder1.classUsageForTesting,

[Siggi Cherem (dart-lang), 2017/05/30 22:41:14]

also here and the two other checks below

[Johnni Winther, 2017/05/31 10:46:38]

Done.

+      'classUsageForTesting',
+      elementEquivalence,
+      equality,
+      verbose: verbose);
+  checkMaps(
+      worldBuilder1.staticMemberUsageForTesting,
+      worldBuilder1.staticMemberUsageForTesting,
+      'staticMemberUsageForTesting',
+      elementEquivalence,
+      equality,
+      verbose: verbose);
+  checkMaps(
+      worldBuilder1.instanceMemberUsageForTesting,
+      worldBuilder1.instanceMemberUsageForTesting,
+      'instanceMemberUsageForTesting',
+      elementEquivalence,
+      equality,
+      verbose: verbose);
+}