remove old way of collecting dependencies for dump-info

pkg/compiler/lib/src/dump_info.dart

 // Copyright (c) 2013, 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 dump_info;
 
 import 'dart:convert'
     show ChunkedConversionSink, JsonEncoder, StringConversionSink;
 
 import 'package:dart2js_info/info.dart';
@@ skipping 401 matching lines @@
   final Map<Element, List<Element>> inlineMap = <Element, List<Element>>{};
 
   final Map<Element, WorldImpact> impacts = <Element, WorldImpact>{};
 
   /// Register the size of the generated output.
   void reportSize(int programSize) {
     _programSize = programSize;
   }
 
   void reportInlined(Element element, Element inlinedFrom) {
+    element = element.declaration;
+    inlinedFrom = inlinedFrom.declaration;
+
     inlineCount.putIfAbsent(element, () => 0);
     inlineCount[element] += 1;
     inlineMap.putIfAbsent(inlinedFrom, () => new List<Element>());
     inlineMap[inlinedFrom].add(element);
   }
 
-  final Map<Element, Set<Element>> _dependencies = {};
-  void registerDependency(Element target) {
-    if (compiler.options.dumpInfo) {
-      _dependencies
-          .putIfAbsent(compiler.currentElement, () => new Set())
-          .add(target);
-    }
-  }
-
   void registerImpact(Element element, WorldImpact impact) {
     if (compiler.options.dumpInfo) {
       impacts[element] = impact;
     }
   }
 
   void unregisterImpact(var impactSource) {
     impacts.remove(impactSource);
   }
 
@@ skipping 98 matching lines @@
         ..add(jsonBuffer.toString())
         ..close();
     });
   }
 
   void dumpInfoJson(StringSink buffer, ClosedWorld closedWorld) {
     JsonEncoder encoder = const JsonEncoder.withIndent('  ');
     Stopwatch stopwatch = new Stopwatch();
     stopwatch.start();
 
+    AllInfo result = infoCollector.result;
+
     // Recursively build links to function uses
     Iterable<Element> functionElements =
         infoCollector._elementToInfo.keys.where((k) => k is FunctionElement);
     for (FunctionElement element in functionElements) {
       FunctionInfo info = infoCollector._elementToInfo[element];
       Iterable<Selection> uses = getRetaining(element, closedWorld);
       // Don't bother recording an empty list of dependencies.
       for (Selection selection in uses) {
         // Don't register dart2js builtin functions that are not recorded.
         Info useInfo = infoCollector._elementToInfo[selection.selectedElement];
         if (useInfo == null) continue;
         info.uses.add(new DependencyInfo(useInfo, '${selection.mask}'));
       }
     }
+
+    // Recursively build links to field uses
+    Iterable<Element> fieldElements =
+        infoCollector._elementToInfo.keys.where((k) => k is FieldElement);
+    for (FieldElement element in fieldElements) {
+      FieldInfo info = infoCollector._elementToInfo[element];
+      Iterable<Selection> uses = getRetaining(element, closedWorld);
+      // Don't bother recording an empty list of dependencies.
+      for (Selection selection in uses) {
+        Info useInfo = infoCollector._elementToInfo[selection.selectedElement];
+        if (useInfo == null) continue;
+        info.uses.add(new DependencyInfo(useInfo, '${selection.mask}'));
+      }
+    }
+
     // Notify the impact strategy impacts are no longer needed for dump info.
     compiler.impactStrategy.onImpactUsed(IMPACT_USE);
 
     // Track dependencies that come from inlining.
     for (Element element in inlineMap.keys) {
       CodeInfo outerInfo = infoCollector._elementToInfo[element];
       if (outerInfo == null) continue;
       for (Element inlined in inlineMap[element]) {
         Info inlinedInfo = infoCollector._elementToInfo[inlined];
         if (inlinedInfo == null) continue;
         outerInfo.uses.add(new DependencyInfo(inlinedInfo, 'inlined'));
       }
     }
 
-    AllInfo result = infoCollector.result;
-
-    for (Element element in _dependencies.keys) {
-      var a = infoCollector._elementToInfo[element];
-      if (a == null) continue;
-      result.dependencies[a] = _dependencies[element]
-          .map((o) => infoCollector._elementToInfo[o])
-          .where((o) => o != null)
-          .toList();
-    }
-
     result.deferredFiles = compiler.deferredLoadTask.computeDeferredMap();
     stopwatch.stop();
     result.program = new ProgramInfo(
         entrypoint: infoCollector._elementToInfo[compiler.mainFunction],
         size: _programSize,
         dart2jsVersion:
             compiler.options.hasBuildId ? compiler.options.buildId : null,
         compilationMoment: new DateTime.now(),
         compilationDuration: compiler.measurer.wallClock.elapsed,
         toJsonDuration:
             new Duration(milliseconds: stopwatch.elapsedMilliseconds),
         dumpInfoDuration: new Duration(milliseconds: this.timing),
         noSuchMethodEnabled: compiler.backend.enabledNoSuchMethod,
         minified: compiler.options.enableMinification);
 
     ChunkedConversionSink<Object> sink = encoder.startChunkedConversion(
         new StringConversionSink.fromStringSink(buffer));
     sink.add(new AllInfoJsonCodec().encode(result));
     compiler.reporter.reportInfo(NO_LOCATION_SPANNABLE, MessageKind.GENERIC, {
       'text': "View the dumped .info.json file at "
           "https://dart-lang.github.io/dump-info-visualizer"
     });
   }
 }