Create new interface instead of ClosureClassMap for variable usage information that is not Element-…

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 196 matching lines @@
     return classInfo;
   }
 
   ClosureInfo visitClosureClassElement(ClosureClassElement element, _) {
     ClosureInfo closureInfo = new ClosureInfo(
         name: element.name,
         outputUnit: _unitInfoForElement(element),
         size: compiler.dumpInfoTask.sizeOf(element));
     _elementToInfo[element] = closureInfo;
 
-    ClosureClassMap closureMap = compiler.closureToClassMapper
-        .getClosureToClassMapping(element.methodElement.resolvedAst);
-    assert(closureMap != null && closureMap.closureClassElement == element);
-
-    FunctionInfo functionInfo = this.process(closureMap.callElement);
+    FunctionInfo functionInfo = this.process(compiler.closureToClassMapper
+        .getCallEntity(element.methodElement.resolvedAst));

[Johnni Winther, 2017/05/31 12:39:51]

`element.methodElement.resolvedAst` -> `element.methodElement`  (getCallEntity
takes a LocalFunctionElement)

     if (functionInfo == null) return null;
     closureInfo.function = functionInfo;
     functionInfo.parent = closureInfo;
 
     result.closures.add(closureInfo);
     return closureInfo;
   }
 
   FunctionInfo visitFunctionElement(FunctionElement element, _) {
     int size = compiler.dumpInfoTask.sizeOf(element);
@@ skipping 380 matching lines @@
 
     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"
     });
   }
 }