Store ResolvedAst on AstElement

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';
+import 'modelz.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) {
     nodeIndices.putIfAbsent(node, () {
       // Some nodes (like Modifier and empty NodeList) can be reused.
@@ skipping 299 matching lines @@
 
   /// Deserializes the [ResolvedAst]s for [element] and its nested local
   /// functions from [objectDecoder] and adds these to [resolvedAstMap].
   /// [parsing] and [getBeginToken] are used for parsing the [Node] for
   /// [element] from its source code.
   static void deserialize(
       Element element,
       ObjectDecoder objectDecoder,
       ParsingContext parsing,
       Token getBeginToken(Uri uri, int charOffset),
-      DeserializerPlugin nativeDataDeserializer,
-      Map<Element, ResolvedAst> resolvedAstMap) {
+      DeserializerPlugin nativeDataDeserializer) {
     ResolvedAstKind kind =
         objectDecoder.getEnum(Key.KIND, ResolvedAstKind.values);
     switch (kind) {
       case ResolvedAstKind.PARSED:
         deserializeParsed(element, objectDecoder, parsing, getBeginToken,
-            nativeDataDeserializer, resolvedAstMap);
+            nativeDataDeserializer);
         break;
       case ResolvedAstKind.DEFAULT_CONSTRUCTOR:
       case ResolvedAstKind.FORWARDING_CONSTRUCTOR:
-        resolvedAstMap[element] = new SynthesizedResolvedAst(element, kind);
+        (element as AstElementMixinZ).resolvedAst =
+            new SynthesizedResolvedAst(element, kind);
         break;
     }
   }
 
   /// Deserialize the [ResolvedAst]s for the member [element] (constructor,
   /// method, or field) and its nested closures. The [ResolvedAst]s are added
   /// to [resolvedAstMap].
   static void deserializeParsed(
-      Element element,
+      AstElementMixinZ element,
       ObjectDecoder objectDecoder,
       ParsingContext parsing,
       Token getBeginToken(Uri uri, int charOffset),
-      DeserializerPlugin nativeDataDeserializer,
-      Map<Element, ResolvedAst> resolvedAstMap) {
+      DeserializerPlugin nativeDataDeserializer/*,
+      Map<Element, ResolvedAst> resolvedAstMap*/) {

[Siggi Cherem (dart-lang), 2016/05/13 19:43:51]

delete?

[Johnni Winther, 2016/05/17 11:59:51]

Done.

     CompilationUnitElement compilationUnit = element.compilationUnit;
     DiagnosticReporter reporter = parsing.reporter;
     Uri uri = objectDecoder.getUri(Key.URI);
 
     /// Returns the first [Token] for parsing the [Node] for [element].
     Token readBeginToken() {
       int charOffset = objectDecoder.getInt(Key.OFFSET);
       Token beginToken = getBeginToken(uri, charOffset);
       if (beginToken == null) {
         reporter.internalError(
@@ skipping 90 matching lines @@
           VariableDefinitions indexDefinition =
               builder.initializingFormal('index');
           FunctionExpression constructorNode = builder.functionExpression(
               builder.modifiers(isConst: true),
               element.enclosingClass.name,
               null,
               builder.argumentList([indexDefinition]),
               builder.emptyStatement());
           return constructorNode;
         case AstKind.ENUM_CONSTANT:
-          EnumConstantElement enumConstant = element;
+          EnumConstantElementZ enumConstant = element;
           EnumClassElement enumClass = element.enclosingClass;
           int index = enumConstant.index;
           AstBuilder builder = new AstBuilder(element.sourcePosition.begin);
           Identifier name = builder.identifier(element.name);
 
           Expression initializer = builder.newExpression(
               enumClass.name, builder.argumentList([builder.literalInt(index)]),
               isConst: true);
           SendSet definition = builder.createDefinition(name, initializer);
 
@@ skipping 159 matching lines @@
           elements.registerTargetLabel(node, labelDefinitions[targetLabelId]);
         }
         ObjectDecoder nativeDataDecoder =
             objectDecoder.getObject(Key.NATIVE, isOptional: true);
         if (nativeDataDecoder != null) {
           var nativeData = nativeDataDeserializer.onData(nativeDataDecoder);
           if (nativeData != null) {
             elements.registerNativeData(node, nativeData);
           }
         }
-        FunctionElement function =
+        LocalFunctionElementZ 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);
+          function.resolvedAst
+              = new ParsedResolvedAst(function, functionExpression,

[Siggi Cherem (dart-lang), 2016/05/13 19:43:51]

nit: dartfmt

[Johnni Winther, 2016/05/17 11:59:51]

Done.

+                  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);
+    (element as AstElementMixinZ).resolvedAst

[Siggi Cherem (dart-lang), 2016/05/13 19:43:51]

it seems like the cast here is not necessary (element is declared as
AstElementMixinZ)

[Johnni Winther, 2016/05/17 11:59:51]

Done.

+        = new ParsedResolvedAst(element, root, body, elements, uri);
   }
 }
 
 const Key PARAMETER_NODE = const Key('parameter.node');
 const Key PARAMETER_INITIALIZER = const Key('parameter.initializer');