Compute non-final static fields without the constant compiler.

tests/compiler/dart2js/serialization/model_test.dart

Index: tests/compiler/dart2js/serialization/model_test.dart
diff --git a/tests/compiler/dart2js/serialization/model_test.dart b/tests/compiler/dart2js/serialization/model_test.dart
index 0a387616f433a3e733abb38e343daafb5cd1a05d..4f9477b85885813608c1c53486c494edb31464b6 100644
--- a/tests/compiler/dart2js/serialization/model_test.dart
+++ b/tests/compiler/dart2js/serialization/model_test.dart
@@ -31,7 +31,8 @@ main(List<String> args) {
       Uri entryPoint = Uri.base.resolve(nativeToUriPath(arguments.filename));
       await checkModels(entryPoint,
           sourceFiles: serializedData.toMemorySourceFiles(),
-          resolutionInputs: serializedData.toUris());
+          resolutionInputs: serializedData.toUris(),
+          verbose: arguments.verbose);
     } else {
       Uri entryPoint = Uri.parse('memory:main.dart');
       arguments.forEachTest(serializedData, TESTS, checkModels);
@@ -53,8 +54,7 @@ Future checkModels(
   print('compile normal ${id}${testDescription}');
   print('------------------------------------------------------------------');
   Compiler compilerNormal = compilerFor(
-      memorySourceFiles: sourceFiles,
-      options: [Flags.analyzeOnly]);
+      memorySourceFiles: sourceFiles);
   compilerNormal.resolution.retainCachesForTesting = true;
   await compilerNormal.run(entryPoint);
   compilerNormal.phase = Compiler.PHASE_DONE_RESOLVING;
@@ -66,8 +66,7 @@ Future checkModels(
   print('------------------------------------------------------------------');
   Compiler compilerDeserialized = compilerFor(
       memorySourceFiles: sourceFiles,
-      resolutionInputs: resolutionInputs,
-      options: [Flags.analyzeOnly]);
+      resolutionInputs: resolutionInputs);
   compilerDeserialized.resolution.retainCachesForTesting = true;
   await compilerDeserialized.run(entryPoint);
   compilerDeserialized.phase = Compiler.PHASE_DONE_RESOLVING;
@@ -128,6 +127,12 @@ Future checkModels(
       areElementsEquivalent,
       verbose: verbose);
 
+  checkSets(
+      compilerNormal.codegenWorld.allReferencedStaticFields,
+      compilerDeserialized.codegenWorld.allReferencedStaticFields,
+      "All referenced static fields",
+      areElementsEquivalent,
+      verbose: verbose);
 }
 
 void checkElements(
@@ -315,13 +320,10 @@ void checkMaps(
   sb.write("$messagePrefix:");
   if (verbose) {
     sb.write("\n Common: \n");
-    for (List pair in common) {
-      var k1 = pair[0];
-      var k2 = pair[1];
-      var v1 = map1[k1];
-      var v2 = map2[k2];
-      sb.write(" key1   =${keyToString(k1)}\n");
-      sb.write(" key2   =${keyToString(k2)}\n");
+    for (var key in common) {
+      var v1 = map1[key];
+      var v2 = map2[key];
+      sb.write(" key    =${keyToString(key)}\n");
       sb.write("  value1=${valueToString(v1)}\n");
       sb.write("  value2=${valueToString(v2)}\n");
     }