dart2js: keep track of non-final static fields.

pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.new_js_emitter.model_emitter;
 
 import '../../constants/values.dart' show ConstantValue, FunctionConstantValue;
 import '../../dart2jslib.dart' show Compiler;
 import '../../dart_types.dart' show DartType;
 import '../../elements/elements.dart' show ClassElement, FunctionElement;
@@ skipping 428 matching lines @@
                                      List<Holder> holders) {
     // TODO(floitsch): initialize eager classes.
     // TODO(floitsch): the hash must depend on the output.
     int hash = fragment.hashCode;
 
     List<js.Expression> deferredCode =
         fragment.libraries.map(emitLibrary).toList();
 
     deferredCode.add(
         emitLazilyInitializedStatics(fragment.staticLazilyInitializedFields));
-
     deferredCode.add(emitConstants(fragment.constants));
 
     js.ArrayInitializer deferredArray = new js.ArrayInitializer(deferredCode);
 
     // This is the code that must be evaluated after all deferred classes have
     // been setup.
-    js.Statement immediateCode =
-        emitEagerClassInitializations(fragment.libraries);
+    js.Statement immediateCode = new js.Block([
+        emitStaticNonFinalFields(fragment.staticNonFinalFields),
+        emitEagerClassInitializations(fragment.libraries)]);
+

[sra1, 2015/05/12 23:20:02]

FYI you could interpolate this with

js.statement('{ # # }', [...]);

Doing to will flatten blocks.

[floitsch, 2015/05/12 23:34:11]

Blocks are flattened by the JS pretty printer too.

 
     js.LiteralString immediateString = unparse(compiler, immediateCode);
 
     js.Expression deferredTypes = types == null
         ? js.string("[]")
         : unparse(compiler, new js.ArrayInitializer(types));
 
     js.ArrayInitializer hunk =
         new js.ArrayInitializer([deferredArray, immediateString,
                                  deferredTypes]);
@@ skipping 706 matching lines @@
 
   var end = Date.now();
   // print('Setup: ' + (end - start) + ' ms.');
 
   #invokeMain;  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }