| Index: pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart
|
| diff --git a/pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart b/pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart
|
| index fe2bdacad904bdfd95a50ca25f7e4c6b158ba878..d8b4b7b9d98bddb9d82ddca1e3842c9a9b8404f2 100644
|
| --- a/pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart
|
| +++ b/pkg/compiler/lib/src/serialization/resolved_ast_serialization.dart
|
| @@ -206,13 +206,8 @@ class ResolvedAstSerializer extends Visitor {
|
| visitNode(Node node) {
|
| Element nodeElement = elements[node];
|
| if (nodeElement != null) {
|
| - if (nodeElement.enclosingClass != null &&
|
| - nodeElement.enclosingClass.isUnnamedMixinApplication) {
|
| - // TODO(johnniwinther): Handle references to members of unnamed mixin
|
| - // applications.
|
| - } else {
|
| - getNodeDataEncoder(node).setElement(Key.ELEMENT, nodeElement);
|
| - }
|
| + serializeElementReference(element, Key.ELEMENT, Key.NAME,
|
| + getNodeDataEncoder(node), nodeElement);
|
| }
|
| DartType type = elements.getType(node);
|
| if (type != null) {
|
| @@ -536,8 +531,9 @@ class ResolvedAstDeserializer {
|
| ObjectDecoder objectDecoder = dataDecoder.getObject(i);
|
| int id = objectDecoder.getInt(Key.ID);
|
| Node node = nodeList[id];
|
| - Element nodeElement =
|
| - objectDecoder.getElement(Key.ELEMENT, isOptional: true);
|
| + Element nodeElement = deserializeElementReference(
|
| + element, Key.ELEMENT, Key.NAME, objectDecoder,
|
| + isOptional: true);
|
| if (nodeElement != null) {
|
| elements[node] = nodeElement;
|
| }
|
|
|