Support enclosingClass on deserialized local elements

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 1482 matching lines @@
     // variables correctly.
     return definingConstructor.type;
   }
 
   @override
   List<DartType> get typeVariables => _unsupported("typeVariables");
 }
 
 abstract class MemberElementMixin
     implements DeserializedElementZ, MemberElement {
+  final List<FunctionElement> nestedClosures = <FunctionElement>[];
+
   @override
   MemberElement get memberContext => this;
 
   @override
   Name get memberName => new Name(name, library);
 
   @override
-  List<FunctionElement> get nestedClosures => <FunctionElement>[];
+  bool get isInjected => _decoder.getBool(Key.IS_INJECTED);
 
   @override
-  bool get isInjected => _decoder.getBool(Key.IS_INJECTED);
+  void forgetElement() {
+    nestedClosures.clear();
+  }
 }
 
 abstract class FieldElementZ extends DeserializedElementZ
     with
         AnalyzableElementMixin,
         AstElementMixinZ,
         TypedElementMixin,
         MemberElementMixin
     implements FieldElement {
   bool _isConst;
@@ skipping 106 matching lines @@
 }
 
 abstract class LocalExecutableMixin
     implements DeserializedElementZ, ExecutableElement, LocalElement {
   ExecutableElement _executableContext;
 
   @override
   Element get enclosingElement => executableContext;
 
   @override
+  Element get enclosingClass => memberContext.enclosingClass;
+
+  @override
   ExecutableElement get executableContext {
     if (_executableContext == null) {
       _executableContext = _decoder.getElement(Key.EXECUTABLE_CONTEXT);
     }
     return _executableContext;
   }
 
   @override
   MemberElement get memberContext => executableContext.memberContext;
 
@@ skipping 670 matching lines @@
   }
 
   @override
   Node get node => throw new UnsupportedError('${this}.node');
 
   @override
   bool get hasNode => false;
 
   String toString() => 'MetadataAnnotationZ(${constant.toDartText()})';
 }