Store ResolvedAst on AstElement

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

 // Copyright (c) 2015, 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.
 
 /// Implementation of the element model used for deserialiation.
 ///
 /// These classes are created by [ElementDeserializer] triggered by the
 /// [Deserializer].
 
 library dart2js.serialization.modelz;
@@ skipping 231 matching lines @@
 }
 
 abstract class AnalyzableElementMixin implements AnalyzableElement, ElementZ {
   @override
   bool get hasTreeElements => _unsupported('hasTreeElements');
 
   @override
   TreeElements get treeElements => _unsupported('treeElements');
 }
 
-abstract class AstElementMixin implements AstElement, ElementZ {
+abstract class AstElementMixinZ implements AstElement, ElementZ {
+  ResolvedAst _resolvedAst;
+
   // TODO(johnniwinther): This is needed for the token invariant assertion. Find
   // another way to bypass the test for modelz.
   @override
   bool get hasNode => false;
 
   @override
-  bool get hasResolvedAst => _unsupported('hasResolvedAst');
+  bool get hasResolvedAst => _resolvedAst != null;
 
   @override
   get node => _unsupported('node');
 
   @override
-  ResolvedAst get resolvedAst => _unsupported('resolvedAst');
+  ResolvedAst get resolvedAst {
+    assert(invariant(this, _resolvedAst != null,
+        message: "ResolvedAst has not been set for $this."));
+    return _resolvedAst;
+  }
+
+  void set resolvedAst(ResolvedAst value) {
+    assert(invariant(this, _resolvedAst == null,
+        message: "ResolvedAst has already been set for $this."));
+    _resolvedAst = value;
+  }
 }
 
 abstract class ContainerMixin
     implements DeserializedElementZ, ScopeContainerElement {
   MappedContainer _membersMap = new MappedContainer();
 
   @override
   Element localLookup(String name) {
     return _membersMap.lookup(
         name, _decoder.getMap(Key.MEMBERS, isOptional: true));
@@ skipping 518 matching lines @@
 
   @override
   void ensureResolved(Resolution resolution) {
     resolution.registerClass(this);
   }
 }
 
 class ClassElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         ClassElementCommon,
         class_members.ClassMemberMixin,
         ContainerMixin,
         LibraryMemberMixin,
         TypeDeclarationMixin<InterfaceType>,
         ClassElementMixin
     implements ClassElement {
   bool _isObject;
   DartType _supertype;
   OrderedTypeSet _allSupertypesAndSelf;
@@ skipping 100 matching lines @@
   InterfaceType get mixinType => _mixinType ??= _decoder.getType(Key.MIXIN);
 }
 
 class UnnamedMixinApplicationElementZ extends ElementZ
     with
         ClassElementCommon,
         ClassElementMixin,
         class_members.ClassMemberMixin,
         TypeDeclarationMixin<InterfaceType>,
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         MixinApplicationElementCommon,
         MixinApplicationElementMixin {
   final String name;
   final ClassElement _subclass;
   final InterfaceType supertype;
   final Link<DartType> interfaces;
   OrderedTypeSet _allSupertypesAndSelf;
   Link<ConstructorElement> _constructors;
 
   UnnamedMixinApplicationElementZ(
@@ skipping 100 matching lines @@
     if (_enumValues == null) {
       _enumValues = _decoder.getElements(Key.FIELDS);
     }
     return _enumValues;
   }
 }
 
 abstract class ConstructorElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         ClassMemberMixin,
         FunctionTypedElementMixin,
         ParametersMixin,
         TypedElementMixin,
         MemberElementMixin
     implements
         ConstructorElement,
         // TODO(johnniwinther): Sort out whether a constructor is a method.
         MethodElement {
   ConstantConstructor _constantConstructor;
@@ skipping 160 matching lines @@
   }
 
   @override
   PrefixElement get redirectionDeferredPrefix {
     _ensureRedirection();
     return _redirectionDeferredPrefix;
   }
 }
 
 class ForwardingConstructorElementZ extends ElementZ
-    with AnalyzableElementMixin, AstElementMixin
+    with AnalyzableElementMixin, AstElementMixinZ
     implements ConstructorElement {
   final MixinApplicationElement enclosingClass;
   final ConstructorElement definingConstructor;
 
   ForwardingConstructorElementZ(this.enclosingClass, this.definingConstructor);
 
   @override
   CompilationUnitElement get compilationUnit => enclosingClass.compilationUnit;
 
   @override
@@ skipping 114 matching lines @@
   @override
   Name get memberName => new Name(name, library);
 
   @override
   List<FunctionElement> get nestedClosures => <FunctionElement>[];
 }
 
 abstract class FieldElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         TypedElementMixin,
         MemberElementMixin
     implements FieldElement {
   bool _isConst;
   ConstantExpression _constant;
 
   FieldElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   ElementKind get kind => ElementKind.FIELD;
@@ skipping 46 matching lines @@
 }
 
 class InstanceFieldElementZ extends FieldElementZ
     with ClassMemberMixin, InstanceMemberMixin {
   InstanceFieldElementZ(ObjectDecoder decoder) : super(decoder);
 }
 
 abstract class FunctionElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         ParametersMixin,
         FunctionTypedElementMixin,
         TypedElementMixin,
         MemberElementMixin
     implements MethodElement {
   FunctionElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   ElementKind get kind => ElementKind.FUNCTION;
 
@@ skipping 58 matching lines @@
   @override
   bool get hasTreeElements => memberContext.hasTreeElements;
 
   @override
   TreeElements get treeElements => memberContext.treeElements;
 }
 
 class LocalFunctionElementZ extends DeserializedElementZ
     with
         LocalExecutableMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         ParametersMixin,
         FunctionTypedElementMixin,
         TypedElementMixin
     implements LocalFunctionElement {
   LocalFunctionElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   accept(ElementVisitor visitor, arg) {
     return visitor.visitLocalFunctionElement(this, arg);
   }
 
   @override
   ElementKind get kind => ElementKind.FUNCTION;
 
   @override
   AsyncMarker get asyncMarker {
     return _decoder.getEnum(Key.ASYNC_MARKER, AsyncMarker.values);
   }
 }
 
 abstract class GetterElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         FunctionTypedElementMixin,
         ParametersMixin,
         TypedElementMixin,
         MemberElementMixin
     implements GetterElement {
   AbstractFieldElement abstractField;
   SetterElement setter;
 
   GetterElementZ(ObjectDecoder decoder) : super(decoder);
 
@@ skipping 19 matching lines @@
 }
 
 class InstanceGetterElementZ extends GetterElementZ
     with ClassMemberMixin, InstanceMemberMixin {
   InstanceGetterElementZ(ObjectDecoder decoder) : super(decoder);
 }
 
 abstract class SetterElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         FunctionTypedElementMixin,
         ParametersMixin,
         TypedElementMixin,
         MemberElementMixin
     implements SetterElement {
   AbstractFieldElement abstractField;
   GetterElement getter;
 
   SetterElementZ(ObjectDecoder decoder) : super(decoder);
 
@@ skipping 71 matching lines @@
   @override
   T computeType(Resolution resolution) => thisType;
 
   @override
   bool get isResolved => true;
 }
 
 class TypedefElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         LibraryMemberMixin,
         ParametersMixin,
         TypeDeclarationMixin<TypedefType>
     implements TypedefElement {
   DartType _alias;
 
   TypedefElementZ(ObjectDecoder decoder) : super(decoder);
 
   TypedefType _createType(List<DartType> typeArguments) {
     return new TypedefType(this, typeArguments);
@@ skipping 21 matching lines @@
   }
 
   @override
   void ensureResolved(Resolution resolution) {}
 
   @override
   void checkCyclicReference(Resolution resolution) {}
 }
 
 class TypeVariableElementZ extends DeserializedElementZ
-    with AnalyzableElementMixin, AstElementMixin, TypedElementMixin
+    with AnalyzableElementMixin, AstElementMixinZ, TypedElementMixin
     implements TypeVariableElement {
   TypeDeclarationElement _typeDeclaration;
   TypeVariableType _type;
   DartType _bound;
   Name _memberName;
 
   TypeVariableElementZ(ObjectDecoder decoder) : super(decoder);
 
   Name get memberName {
     if (_memberName == null) {
@@ skipping 37 matching lines @@
       _bound = _decoder.getType(Key.BOUND);
     }
     return _bound;
   }
 
   @override
   LibraryElement get library => typeDeclaration.library;
 }
 
 class SyntheticTypeVariableElementZ extends ElementZ
-    with AnalyzableElementMixin, AstElementMixin
+    with AnalyzableElementMixin, AstElementMixinZ
     implements TypeVariableElement {
   final TypeDeclarationElement typeDeclaration;
   final int index;
   final String name;
   TypeVariableType _type;
   DartType _bound;
   Name _memberName;
 
   SyntheticTypeVariableElementZ(this.typeDeclaration, this.index, this.name);
 
@@ skipping 43 matching lines @@
   LibraryElement get library => typeDeclaration.library;
 
   @override
   int get sourceOffset => typeDeclaration.sourceOffset;
 
   @override
   SourceSpan get sourcePosition => typeDeclaration.sourcePosition;
 }
 
 abstract class ParameterElementZ extends DeserializedElementZ
-    with AnalyzableElementMixin, AstElementMixin, TypedElementMixin
+    with AnalyzableElementMixin, AstElementMixinZ, TypedElementMixin
     implements ParameterElement {
   FunctionElement _functionDeclaration;
   ConstantExpression _constant;
   DartType _type;
 
   ParameterElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   bool get isFinal => _decoder.getBool(Key.IS_FINAL);
 
@@ skipping 92 matching lines @@
     return visitor.visitFieldParameterElement(this, arg);
   }
 
   @override
   ElementKind get kind => ElementKind.INITIALIZING_FORMAL;
 }
 
 class LocalVariableElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
-        AstElementMixin,
+        AstElementMixinZ,
         LocalExecutableMixin,
         TypedElementMixin
     implements LocalVariableElement {
   bool _isConst;
   ConstantExpression _constant;
 
   LocalVariableElementZ(ObjectDecoder decoder) : super(decoder);
 
   @override
   accept(ElementVisitor visitor, arg) {
@@ skipping 157 matching lines @@
   }
 
   @override
   ElementKind get kind => ElementKind.PREFIX;
 
   @override
   Element lookupLocalMember(String memberName) {
     return _unsupported('lookupLocalMember');
   }
 }