Add more info to closure_test output

tests/compiler/dart2js/equivalence/id_equivalence_test.dart

Index: tests/compiler/dart2js/equivalence/id_equivalence_test.dart
diff --git a/tests/compiler/dart2js/equivalence/id_equivalence_test.dart b/tests/compiler/dart2js/equivalence/id_equivalence_test.dart
index e30be62f90c93f5cf8147b8044c06014d6e80a29..e7230e9c8acf06135d27e0a5a97fd7b7dc40fb62 100644
--- a/tests/compiler/dart2js/equivalence/id_equivalence_test.dart
+++ b/tests/compiler/dart2js/equivalence/id_equivalence_test.dart
@@ -36,18 +36,20 @@ main() {
             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');
@@ -62,15 +64,13 @@ main() {
 ///
 /// 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.
@@ -98,9 +98,9 @@ class ComputerMixin {
 /// 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) {
@@ -147,21 +147,20 @@ class ResolvedAstComputer extends AbstractResolvedAstComputer
 ///
 /// 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) {