Serialize ParameterElement.node and ParameterElement.initializer for type inference

pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart

 // Copyright (c) 2016, 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.serialization.resolved_ast;
 
 import '../common.dart';
 import '../common/resolution.dart';
 import '../constants/expressions.dart';
 import '../dart_types.dart';
 import '../diagnostics/diagnostic_listener.dart';
 import '../elements/elements.dart';
 import '../elements/modelx.dart';
 import '../parser/listener.dart' show ParserError;
 import '../parser/node_listener.dart' show NodeListener;
 import '../parser/parser.dart' show Parser;
 import '../resolution/enum_creator.dart';
 import '../resolution/send_structure.dart';
 import '../resolution/tree_elements.dart';
 import '../tokens/token.dart';
 import '../tree/tree.dart';
 import '../universe/selector.dart';
 import '../util/util.dart';
 import 'keys.dart';
+import 'modelz.dart';
 import 'serialization.dart';
 import 'serialization_util.dart';
 
 /// Visitor that computes a node-index mapping.
 class AstIndexComputer extends Visitor {
   final Map<Node, int> nodeIndices = <Node, int>{};
   final List<Node> nodeList = <Node>[];
 
   @override
   visitNode(Node node) {
@@ skipping 123 matching lines @@
       for (JumpTarget jumpTarget in jumpTargetMap.keys) {
         serializeJumpTarget(jumpTarget, list.createObject());
       }
     }
     if (labelDefinitionMap.isNotEmpty) {
       ListEncoder list = objectEncoder.createList(Key.LABEL_DEFINITIONS);
       for (LabelDefinition labelDefinition in labelDefinitionMap.keys) {
         serializeLabelDefinition(labelDefinition, list.createObject());
       }
     }
+    if (element is FunctionElement) {
+      FunctionElement function = element;
+      function.functionSignature.forEachParameter((ParameterElement parameter) {
+        ParameterElement parameterImpl = parameter.implementation;
+        getNodeDataEncoder(parameterImpl.node)
+            .setElement(PARAMETER_NODE, parameter);

[Siggi Cherem (dart-lang), 2016/05/07 01:34:35]

interesting --- it feels a bit odd that our storage here is backwards (mapping
node to parameter, instead of parameter to node). Do we have anything that
supports the opposite direction (paramter -> nodeid)? Is it worth changing it?

I'm guessing this doesn't matter much since the goal is to replace this format
in the near future.

[Johnni Winther, 2016/05/09 08:18:19]

Yes, it does feel awkward to map nodes to elements here. Adding a TODO to
consider adding support for the other direction.

+        if (parameter.initializer != null) {
+          getNodeDataEncoder(parameterImpl.initializer)
+              .setElement(PARAMETER_INITIALIZER, parameter);
+        }
+      });
+    }
   }
 
   /// Serialize [target] into [encoder].
   void serializeJumpTarget(JumpTarget jumpTarget, ObjectEncoder encoder) {
     encoder.setElement(Key.EXECUTABLE_CONTEXT, jumpTarget.executableContext);
     encoder.setInt(Key.NODE, nodeIndices[jumpTarget.statement]);
     encoder.setInt(Key.NESTING_LEVEL, jumpTarget.nestingLevel);
     encoder.setBool(Key.IS_BREAK_TARGET, jumpTarget.isBreakTarget);
     encoder.setBool(Key.IS_CONTINUE_TARGET, jumpTarget.isContinueTarget);
     if (jumpTarget.labels.isNotEmpty) {
@@ skipping 18 matching lines @@
   /// Computes the [ListEncoder] for serializing data for nodes.
   ListEncoder get nodeDataEncoder {
     if (_nodeDataEncoder == null) {
       _nodeDataEncoder = objectEncoder.createList(Key.DATA);
     }
     return _nodeDataEncoder;
   }
 
   /// Computes the [ObjectEncoder] for serializing data for [node].
   ObjectEncoder getNodeDataEncoder(Node node) {
+    assert(invariant(element, node != null, message: "Node must be non-null."));
     int id = nodeIndices[node];
+    assert(invariant(element, id != null, message: "Node without id: $node"));
     return nodeData.putIfAbsent(id, () {
       ObjectEncoder objectEncoder = nodeDataEncoder.createObject();
       objectEncoder.setInt(Key.ID, id);
       return objectEncoder;
     });
   }
 
   @override
   visitNode(Node node) {
     Element nodeElement = elements[node];
@@ skipping 426 matching lines @@
         }
         FunctionElement function =
             objectDecoder.getElement(Key.FUNCTION, isOptional: true);
         if (function != null) {
           FunctionExpression functionExpression = node;
           assert(invariant(function, !resolvedAstMap.containsKey(function),
               message: "ResolvedAst has already been computed for $function."));
           resolvedAstMap[function] = new ParsedResolvedAst(function,
               functionExpression, functionExpression.body, elements, uri);
         }
+        // TODO(johnniwinther): Remove these when inference doesn't need `.node`
+        // and `.initializer` of [ParameterElement]s.
+        ParameterElementZ parameter =
+            objectDecoder.getElement(PARAMETER_NODE, isOptional: true);
+        if (parameter != null) {
+          parameter.node = node;
+        }
+        parameter =
+            objectDecoder.getElement(PARAMETER_INITIALIZER, isOptional: true);
+        if (parameter != null) {
+          parameter.initializer = node;
+        }
       }
     }
     assert(invariant(element, !resolvedAstMap.containsKey(element),
         message: "ResolvedAst has already been computed for $element."));
     resolvedAstMap[element] =
         new ParsedResolvedAst(element, root, body, elements, uri);
   }
 }
+
+const Key PARAMETER_NODE = const Key('parameter.node');
+const Key PARAMETER_INITIALIZER = const Key('parameter.initializer');