Compute non-final static fields without the constant compiler.

pkg/compiler/lib/src/compile_time_constants.dart

 // Copyright (c) 2012, 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.compile_time_constant_evaluator;
 
 import 'common.dart';
 import 'common/resolution.dart' show Resolution;
 import 'common/tasks.dart' show CompilerTask, Measurer;
 import 'compiler.dart' show Compiler;
@@ skipping 127 matching lines @@
    *
    * Must contain all static and global initializations of const fields.
    *
    * May contain eagerly compiled initial values for statics and instance
    * fields (if those are compile-time constants).
    *
    * May contain default parameter values of optional arguments.
    *
    * Invariant: The keys in this map are declarations.
    */
-  final Map<VariableElement, ConstantExpression> initialVariableValues =
+  final Map<VariableElement, ConstantExpression> _initialVariableValues =
       new Map<VariableElement, ConstantExpression>();
 
   /** The set of variable elements that are in the process of being computed. */
   final Set<VariableElement> pendingVariables = new Set<VariableElement>();
 
   final Map<ConstantExpression, ConstantValue> constantValueMap =
       <ConstantExpression, ConstantValue>{};
 
   ConstantCompilerBase(this.compiler, this.constantSystem);
 
   DiagnosticReporter get reporter => compiler.reporter;
 
   CoreTypes get coreTypes => compiler.coreTypes;
 
   @override
   @deprecated
   ConstantValue getConstantValueForVariable(VariableElement element) {
-    return getConstantValue(initialVariableValues[element.declaration]);
+    return getConstantValue(_initialVariableValues[element.declaration]);
   }
 
   ConstantExpression compileConstant(VariableElement element) {
     return internalCompileVariable(element, true, true);
   }
 
   @override
   void evaluate(ConstantExpression constant) {
     constantValueMap.putIfAbsent(constant, () {
       return constant.evaluate(
           new _CompilerEnvironment(compiler), constantSystem);
     });
   }
 
   ConstantExpression compileVariable(VariableElement element) {
     return internalCompileVariable(element, false, true);
   }
 
   /// Compile [element] into a constant expression. If [isConst] is true,
   /// then [element] is a constant variable. If [checkType] is true, then
   /// report an error if [element] does not typecheck.
   ConstantExpression internalCompileVariable(
       VariableElement element, bool isConst, bool checkType) {
-    if (initialVariableValues.containsKey(element.declaration)) {
-      ConstantExpression result = initialVariableValues[element.declaration];
+    if (_initialVariableValues.containsKey(element.declaration)) {
+      ConstantExpression result = _initialVariableValues[element.declaration];
       return result;
     }
     if (element.hasConstant) {
       if (element.constant != null) {
         if (compiler.serialization.supportsDeserialization) {
           evaluate(element.constant);
         }
         assert(invariant(element, hasConstantValue(element.constant),
             message: "Constant expression has not been evaluated: "
                 "${element.constant.toStructuredText()}."));
@@ skipping 77 matching lines @@
               // If the field cannot be lazily initialized, we will throw
               // the exception at runtime.
               expression = null;
             }
           }
         }
       }
     }
     if (expression != null) {
       element.constant = expression;
-      initialVariableValues[element.declaration] = expression;
+      _initialVariableValues[element.declaration] = expression;
     } else {
       assert(invariant(element, !isConst,
           message: "Variable $element does not compile to a constant."));
     }
     pendingVariables.remove(element);
     return expression;
   }
 
   void cacheConstantValue(ConstantExpression expression, ConstantValue value) {
     constantValueMap[expression] = value;
@@ skipping 26 matching lines @@
       {bool enforceConst: true}) {
     return compileNodeWithDefinitions(node, elements, isConst: enforceConst);
   }
 
   ConstantExpression compileMetadata(
       MetadataAnnotation metadata, Node node, TreeElements elements) {
     return compileNodeWithDefinitions(node, elements);
   }
 
   void forgetElement(Element element) {
-    initialVariableValues.remove(element);
+    _initialVariableValues.remove(element);
     if (element is ScopeContainerElement) {
-      element.forEachLocalMember(initialVariableValues.remove);
+      element.forEachLocalMember(_initialVariableValues.remove);
     }
     if (element is FunctionElement && element.hasFunctionSignature) {
       element.functionSignature.forEachParameter(this.forgetElement);
     }
   }
 }
 
 /// [ConstantCompiler] that uses the Dart semantics for the compile-time
 /// constant evaluation.
 class DartConstantCompiler extends ConstantCompilerBase {
@@ skipping 1017 matching lines @@
 class _CompilerEnvironment implements Environment {
   final Compiler compiler;
 
   _CompilerEnvironment(this.compiler);
 
   @override
   String readFromEnvironment(String name) {
     return compiler.fromEnvironment(name);
   }
 }