Add more info to closure_test output

tests/compiler/dart2js/equivalence/id_equivalence_test.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:io';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/common.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
 import 'package:compiler/src/elements/elements.dart';
@@ skipping 18 matching lines @@
     for (String path in dataDirectories) {
       Directory dataDir = new Directory.fromUri(Platform.script.resolve(path));
       await for (FileSystemEntity entity in dataDir.list()) {
         print('Checking ${entity.uri}');
         String annotatedCode =
             await new File.fromUri(entity.uri).readAsString();
         IdData data1 = await computeData(
             annotatedCode, computeAstMemberData, compileFromSource);
         IdData data2 = await computeData(
             annotatedCode, computeIrMemberData, compileFromDill);
-        data1.actualMap.forEach((Id id, String value1) {
-          String value2 = data2.actualMap[id];
+        data1.actualMap.forEach((Id id, ActualData actualData1) {
+          String value1 = actualData1.value;
+          String value2 = data2.actualMap[id]?.value;
           if (value1 != value2) {
-            reportHere(data1.compiler.reporter, data1.sourceSpanMap[id],
+            reportHere(data1.compiler.reporter, actualData1.sourceSpan,
                 '$id: from source:${value1},from dill:${value2}');
           }
           Expect.equals(value1, value2, 'Value mismatch for $id');
         });
-        data2.actualMap.forEach((Id id, String value2) {
-          String value1 = data1.actualMap[id];
+        data2.actualMap.forEach((Id id, ActualData actualData2) {
+          String value2 = actualData2.value;
+          String value1 = data1.actualMap[id]?.value;
           if (value1 != value2) {
-            reportHere(data2.compiler.reporter, data2.sourceSpanMap[id],
+            reportHere(data2.compiler.reporter, actualData2.sourceSpan,
                 '$id: from source:${value1},from dill:${value2}');
           }
           Expect.equals(value1, value2, 'Value mismatch for $id');
         });
       }
     }
   });
 }
 
 /// Compute a descriptive mapping of the [Id]s in [_member] as a
 /// [MemberElement].
 ///
 /// Fills [actualMap] with the data and [sourceSpanMap] with the source spans
 /// for the data origin.
-void computeAstMemberData(Compiler compiler, MemberEntity _member,
-    Map<Id, String> actualMap, Map<Id, SourceSpan> sourceSpanMap,
+void computeAstMemberData(
+    Compiler compiler, MemberEntity _member, Map<Id, ActualData> actualMap,
     {bool verbose: false}) {
   MemberElement member = _member;
   ResolvedAst resolvedAst = member.resolvedAst;
   if (resolvedAst.kind != ResolvedAstKind.PARSED) return;
-  new ResolvedAstComputer(
-          compiler.reporter, actualMap, sourceSpanMap, resolvedAst)
-      .run();
+  new ResolvedAstComputer(compiler.reporter, actualMap, resolvedAst).run();
 }
 
 /// Mixin used for0computing a descriptive mapping of the [Id]s in a member.
 class ComputerMixin {
   String computeMemberName(String className, String memberName) {
     if (className != null) {
       return 'member:$className.$memberName';
     }
     return 'member:$memberName';
   }
 
   String computeLocalName(String localName) {
     return 'local:$localName';
   }
 
   String computeDynamicGetName(String propertyName) {
     return 'dynamic-get:$propertyName';
   }
 
   String computeDynamicInvokeName(String propertyName) {
     return 'dynamic-invoke:$propertyName';
   }
 }
 
 /// AST visitor for computing a descriptive mapping of the [Id]s in a member.
 class ResolvedAstComputer extends AbstractResolvedAstComputer
     with ComputerMixin {
-  ResolvedAstComputer(DiagnosticReporter reporter, Map<Id, String> actualMap,
-      Map<Id, SourceSpan> spannableMap, ResolvedAst resolvedAst)
-      : super(reporter, actualMap, spannableMap, resolvedAst);
+  ResolvedAstComputer(DiagnosticReporter reporter,
+      Map<Id, ActualData> actualMap, ResolvedAst resolvedAst)
+      : super(reporter, actualMap, resolvedAst);
 
   @override
   String computeNodeValue(ast.Node node, AstElement element) {
     if (element != null && element.isLocal) {
       return computeLocalName(element.name);
     }
     if (node is ast.Send) {
       dynamic sendStructure = elements.getSendStructure(node);
       if (sendStructure == null) return null;
 
@@ skipping 26 matching lines @@
   String computeElementValue(AstElement element) {
     return computeMemberName(element.enclosingClass?.name, element.name);
   }
 }
 
 /// Compute a descriptive mapping of the [Id]s in [member] as a kernel based
 /// member.
 ///
 /// Fills [actualMap] with the data and [sourceSpanMap] with the source spans
 /// for the data origin.
-void computeIrMemberData(Compiler compiler, MemberEntity member,
-    Map<Id, String> actualMap, Map<Id, Spannable> spannableMap,
+void computeIrMemberData(
+    Compiler compiler, MemberEntity member, Map<Id, ActualData> actualMap,
     {bool verbose: false}) {
   KernelBackendStrategy backendStrategy = compiler.backendStrategy;
   KernelToElementMapForBuilding elementMap = backendStrategy.elementMap;
   MemberDefinition definition = elementMap.getMemberDefinition(member);
   assert(definition.kind == MemberKind.regular,
       failedAt(member, "Unexpected member definition $definition"));
-  new IrComputer(actualMap, spannableMap).run(definition.node);
+  new IrComputer(actualMap).run(definition.node);
 }
 
 /// IR visitor for computing a descriptive mapping of the [Id]s in a member.
 class IrComputer extends AbstractIrComputer with ComputerMixin {
-  IrComputer(Map<Id, String> actualMap, Map<Id, SourceSpan> spannableMap)
-      : super(actualMap, spannableMap);
+  IrComputer(Map<Id, ActualData> actualMap) : super(actualMap);
 
   @override
   String computeNodeValue(ir.TreeNode node) {
     if (node is ir.VariableDeclaration) {
       return computeLocalName(node.name);
     } else if (node is ir.FunctionDeclaration) {
       return computeLocalName(node.variable.name);
     } else if (node is ir.FunctionExpression) {
       return computeLocalName('');
     } else if (node is ir.MethodInvocation) {
       return computeDynamicInvokeName(node.name.name);
     } else if (node is ir.PropertyGet) {
       return computeDynamicGetName(node.name.name);
     }
     return '<unknown:$node>';
   }
 
   @override
   String computeMemberValue(ir.Member member) {
     return computeMemberName(member.enclosingClass?.name, member.name.name);
   }
 }