Use MemberEntity more in type_graph_nodes

pkg/compiler/lib/src/inferrer/type_graph_dump.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.inferrer.type_graph_dump;
 
 import '../../compiler_new.dart';
 import '../elements/elements.dart';
+import '../elements/entities.dart';
 import '../types/types.dart';
 import 'inferrer_engine.dart';
 import 'type_graph_nodes.dart';
 import 'debug.dart';
 
 /// Dumps the type inference graph in Graphviz Dot format into the `typegraph`
 /// subfolder of the current working directory. Each function body is dumped in
 /// a separate file.
 ///
 /// The resulting .dot files must be processed using the Graphviz `dot` command,
@@ skipping 37 matching lines @@
       Set<TypeInformation> copy = node.assignments.toSet();
       if (!copy.isEmpty) {
         assignmentsBeforeTracing[node] = copy;
       }
     }
   }
 
   /// Dumps the entire graph.
   void afterAnalysis() {
     // Group all the type nodes by their context member.
-    Map<MemberElement, List<TypeInformation>> nodes =
-        <MemberElement, List<TypeInformation>>{};
+    Map<MemberEntity, List<TypeInformation>> nodes =
+        <MemberEntity, List<TypeInformation>>{};
     for (TypeInformation node in inferrer.types.allTypes) {
       if (node.contextMember != null) {
         nodes
             .putIfAbsent(node.contextMember, () => <TypeInformation>[])
             .add(node);
       }
     }
     // Print every group separately.
-    for (MemberElement element in nodes.keys) {
+    for (MemberEntity element in nodes.keys) {
       OutputSink output;
       try {
         String name = filenameFromElement(element);
         output = inferrer.compiler
             .outputProvider('$outputDir/$name', 'dot', OutputType.debug);
         _GraphGenerator visitor = new _GraphGenerator(this, element, output);
         for (TypeInformation node in nodes[element]) {
           visitor.visit(node);
         }
         visitor.addMissingNodes();
         visitor.finish();
       } finally {
         if (output != null) {
           output.close();
         }
       }
     }
   }
 
   /// Returns the filename (without extension) in which to dump the type
   /// graph for [element].
   ///
   /// Will never return the a given filename more than once, even if called with
   /// the same element.
-  String filenameFromElement(Element element) {
+  String filenameFromElement(MemberElement element) {
     // The toString method of elements include characters that are unsuitable
     // for URIs and file systems.
     List<String> parts = <String>[];
     parts.add(element.library?.libraryName);
     parts.add(element.enclosingClass?.name);
-    Element namedElement =
-        element is LocalElement ? element.executableContext : element;
-    if (namedElement.isGetter) {
-      parts.add('get-${namedElement.name}');
-    } else if (namedElement.isSetter) {
-      parts.add('set-${namedElement.name}');
-    } else if (namedElement.isConstructor) {
-      if (namedElement.name.isEmpty) {
+    if (element.isGetter) {
+      parts.add('get-${element.name}');
+    } else if (element.isSetter) {
+      parts.add('set-${element.name}');
+    } else if (element.isConstructor) {
+      if (element.name.isEmpty) {
         parts.add('-constructor');
       } else {
-        parts.add(namedElement.name);
+        parts.add(element.name);
       }
-    } else if (namedElement.isOperator) {
+    } else if (element.isOperator) {
       parts.add(Elements
-          .operatorNameToIdentifier(namedElement.name)
+          .operatorNameToIdentifier(element.name)
           .replaceAll(r'$', '-'));
     } else {
-      parts.add(namedElement.name);
+      parts.add(element.name);
     }
-    if (namedElement != element) {
+    if (element != element) {
       if (element.name.isEmpty) {
         parts.add('anon${element.sourcePosition.begin}');
       } else {
         parts.add(element.name);
       }
     }
     String filename = parts.where((x) => x != null && x != '').join('.');
     if (usedFilenames.add(filename)) return filename;
     // The filename has already been used by another method. Append a serial
     // number to ensure we don't overwrite it.
@@ skipping 318 matching lines @@
     String value = formatType(type.valueType);
     return '$container<$key,$value>';
   }
   if (type is ValueTypeMask) {
     String baseType = formatType(type.forwardTo);
     String value = type.value.toStructuredText();
     return '$baseType=$value';
   }
   return '$type'; // Fall back on toString if not supported here.
 }