Add constant info to the dart2js_info model

lib/info.dart

Index: lib/info.dart
diff --git a/lib/info.dart b/lib/info.dart
index 5adf2e80897aa88032439bfd7d1c67ede8a2fba3..984c5a541852c795aed4b8c8c45ea2855bbc6566 100644
--- a/lib/info.dart
+++ b/lib/info.dart
@@ -111,6 +111,12 @@ class AllInfo {
   /// Information about fields (in any class).
   List<FieldInfo> fields = <FieldInfo>[];
 
+  /// Information about constants anywhere in the program.
+  // TODO(sigmund): expand docs about canonicalization. We don't put these
+  // inside library because a single constant can be used in more than one lib,
+  // and we'll include it only once in the output.
+  List<ConstantInfo> constants = <ConstantInfo>[];
+
   /// Information about output units (should be just one entry if not using
   /// deferred loading).
   List<OutputUnitInfo> outputUnits = <OutputUnitInfo>[];
@@ -177,6 +183,7 @@ class AllInfo {
           'function': _listAsJsonMap(functions),
           'typedef': _listAsJsonMap(typedefs),
           'field': _listAsJsonMap(fields),
+          'constant': _listAsJsonMap(constants),
         },
         'holding': _extractHoldingInfo(),
         'dependencies': _extractDependencies(),
@@ -239,6 +246,12 @@ class _ParseHelper {
     result.fields.addAll(elements['field'].values.map(parseField));
     result.typedefs.addAll(elements['typedef'].values.map(parseTypedef));
 
+    // TODO(sigmund): remove null check on next breaking version
+    var constants = elements['constant'];
+    if (constants != null) {
+      result.constants.addAll(constants.values.map(parseConstant));
+    }
+
     var idMap = {};
     for (var f in result.functions) {
       idMap[f.serializedId] = f;
@@ -316,9 +329,18 @@ class _ParseHelper {
       ..type = json['type']
       ..inferredType = json['inferredType']
       ..code = json['code']
+      ..isConst = json['const'] ?? false

[Harry Terkelsen, 2015/08/19 17:41:31]

also add a todo to remove '?? false' on next breaking version

[Siggi Cherem (dart-lang), 2015/08/19 19:31:15]

Since it was a boolean, I was thinking that we would not generate 'const': false
in the json even when we do a breaking version. That way we can keep the json
size smaller.

WDYT?

[Harry Terkelsen, 2015/08/19 19:34:57]

sgtm

+      ..initializer = parseId(json['initializer'])
       ..closures = json['children'].map(parseId).toList();
   }
 
+  ConstantInfo parseConstant(Map json) {
+    ConstantInfo result = parseId(json['id']);
+    return result
+      ..code = json['code']
+      ..size = json['size'];
+  }
+
   TypedefInfo parseTypedef(Map json) {
     TypedefInfo result = parseId(json['id']);
     return result..name = json['name']
@@ -369,6 +391,8 @@ class _ParseHelper {
       return new ClassInfo._(serializedId);
     } else if (serializedId.startsWith('field/')) {
       return new FieldInfo._(serializedId);
+    } else if (serializedId.startsWith('constant/')) {
+      return new ConstantInfo._(serializedId);
     } else if (serializedId.startsWith('typedef/')) {
       return new TypedefInfo._(serializedId);
     } else if (serializedId.startsWith('outputUnit/')) {
@@ -465,6 +489,33 @@ class ClassInfo extends BasicInfo {
   void accept(InfoVisitor visitor) => visitor.visitClass(this);
 }
 
+/// Information about a constant value.
+// TODO(sigmund): add dependency data for ConstantInfo
+class ConstantInfo extends BasicInfo {
+  /// The actual generated code for the field.
+  String code;
+
+  static int _ids = 0;

[Harry Terkelsen, 2015/08/19 17:41:31]

I'm not clear on why constants get their own ids separate from the rest of the
Infos. Won't this mess up serialization?

[Siggi Cherem (dart-lang), 2015/08/19 19:31:15]

Note that every info kind has their own separate id counter. We always use the
full id with the kind prefix to identify each element (e.g. 'const/32').

[Harry Terkelsen, 2015/08/19 19:34:57]

Acknowledged.

+  // TODO(sigmund): Add coverage support to constants?
+  ConstantInfo(
+      {int size: 0,
+      this.code,
+      OutputUnitInfo outputUnit})
+      : super(InfoKind.constant, _ids++, null, outputUnit, size, null);
+
+  ConstantInfo._(String serializedId) : super._fromId(serializedId);
+
+  Map toJson() {
+    var result = super.toJson()
+    ..addAll({

[Harry Terkelsen, 2015/08/19 17:41:31]

weird formatting, is this what dartfmt outputs?

[Siggi Cherem (dart-lang), 2015/08/19 19:31:15]

sorry, my faull. I've fixed this line for now, but I'll run the formatter on the
entire repo after submitting this.

[Siggi Cherem (dart-lang), 2015/08/19 19:53:40]

FYI - I pushed the formatter changes directly (here is the commit
https://github.com/dart-lang/dart2js_info/commit/cf9395226d886d2a5faf78ae2799...)

+      'code': code,
+    });
+    return result;
+  }
+
+  void accept(InfoVisitor visitor) => visitor.visitConstant(this);
+}
+
 /// Information about a field element.
 class FieldInfo extends BasicInfo with CodeInfo {
   /// The type of the field.
@@ -479,6 +530,12 @@ class FieldInfo extends BasicInfo with CodeInfo {
   /// The actual generated code for the field.
   String code;
 
+  /// Whether this corresponds to a const field declaration.
+  bool isConst;
+
+  /// When [isConst] is true, the constant initializer expression.
+  ConstantInfo initializer;
+
   static int _ids = 0;
   FieldInfo(
       {String name,
@@ -488,18 +545,26 @@ class FieldInfo extends BasicInfo with CodeInfo {
       this.inferredType,
       this.closures,
       this.code,
-      OutputUnitInfo outputUnit})
+      OutputUnitInfo outputUnit,
+      this.isConst})
       : super(InfoKind.field, _ids++, name, outputUnit, size, coverageId);
 
   FieldInfo._(String serializedId) : super._fromId(serializedId);
 
-  Map toJson() => super.toJson()
+  Map toJson() {
+    var result = super.toJson()
     ..addAll({
       'children': closures.map((i) => i.serializedId).toList(),
       'inferredType': inferredType,
       'code': code,
       'type': type,
     });
+    if (isConst) {
+      result['const'] = true;
+      if (initializer != null) result['initializer'] = initializer.serializedId;
+    }
+    return result;
+  }
 
   void accept(InfoVisitor visitor) => visitor.visitField(this);
 }
@@ -658,6 +723,7 @@ enum InfoKind {
   clazz,
   function,
   field,
+  constant,
   outputUnit,
   typedef,
 }
@@ -668,6 +734,7 @@ String _kindToString(InfoKind kind) {
     case InfoKind.clazz: return 'class';
     case InfoKind.function: return 'function';
     case InfoKind.field: return 'field';
+    case InfoKind.constant: return 'constant';
     case InfoKind.outputUnit: return 'outputUnit';
     case InfoKind.typedef: return 'typedef';
     default: return null;
@@ -686,6 +753,7 @@ InfoKind _kindFromString(String kind) {
     case 'class': return InfoKind.clazz;
     case 'function': return InfoKind.function;
     case 'field': return InfoKind.field;
+    case 'constant': return InfoKind.constant;
     case 'outputUnit': return InfoKind.outputUnit;
     case 'typedef': return InfoKind.typedef;
     default: return null;
@@ -699,6 +767,7 @@ class InfoVisitor {
   visitLibrary(LibraryInfo info) {}
   visitClass(ClassInfo info) {}
   visitField(FieldInfo info) {}
+  visitConstant(ConstantInfo info) {}
   visitFunction(FunctionInfo info) {}
   visitTypedef(TypedefInfo info) {}
   visitOutput(OutputUnitInfo info) {}
@@ -715,6 +784,7 @@ class RecursiveInfoVisitor extends InfoVisitor {
     // Note: we don't visit functions, fields, classes, and typedefs because
     // they are reachable from the library info.
     info.libraries.forEach(visitLibrary);
+    info.constants.forEach(visitConstant);
   }
 
   visitLibrary(LibraryInfo info) {