Revert "Reduce use of getClosureInfoForMember and cleanup closure_test"

tests/compiler/dart2js/closure/closure_test.dart

Index: tests/compiler/dart2js/closure/closure_test.dart
diff --git a/tests/compiler/dart2js/closure/closure_test.dart b/tests/compiler/dart2js/closure/closure_test.dart
index c3611f95310ba54d382290cf3123b014e9a39f46..b2ef073527dea43c286cf0f36209358de76646f7 100644
--- a/tests/compiler/dart2js/closure/closure_test.dart
+++ b/tests/compiler/dart2js/closure/closure_test.dart
@@ -96,7 +96,7 @@ class ClosureAstComputer extends AstDataExtractor with ComputeValueMixin {
   String computeNodeValue(ast.Node node, [AstElement element]) {
     if (element != null && element.isLocal) {
       if (element.isFunction) {
-        return computeObjectValue(element);
+        return computeEntityValue(element);
       } else {
         LocalElement local = element;
         return computeLocalValue(local);
@@ -110,7 +110,7 @@ class ClosureAstComputer extends AstDataExtractor with ComputeValueMixin {
   String computeElementValue(AstElement element) {
     // TODO(johnniwinther,efortuna): Collect data for the member
     // (has thisLocal, has box, etc.).
-    return computeObjectValue(element);
+    return computeEntityValue(element);
   }
 }
 
@@ -147,20 +147,18 @@ class ClosureIrChecker extends IrDataExtractor with ComputeValueMixin<ir.Node> {
   @override
   String computeNodeValue(ir.Node node) {
     if (node is ir.VariableDeclaration) {
-      if (node.parent is ir.FunctionDeclaration) {
-        return computeObjectValue(node.parent);
-      }
       Local local = _localsMap.getLocalVariable(node);
       return computeLocalValue(local);
-    } else if (node is ir.FunctionExpression) {
-      return computeObjectValue(node);
     }
+    // TODO(johnniwinther,efortuna): Collect data for other nodes?
     return null;
   }
 
   @override
   String computeMemberValue(ir.Member node) {
-    return computeObjectValue(member);
+    // TODO(johnniwinther,efortuna): Collect data for the member
+    // (has thisLocal, has box, etc.).
+    return computeEntityValue(member);
   }
 }
 
@@ -173,24 +171,25 @@ abstract class ComputeValueMixin<T> {
   Link<ClosureRepresentationInfo> closureRepresentationInfoStack =
       const Link<ClosureRepresentationInfo>();
   ClosureRepresentationInfo get closureRepresentationInfo =>
-      closureRepresentationInfoStack.isNotEmpty
-          ? closureRepresentationInfoStack.head
-          : null;
+      closureRepresentationInfoStack.head;
 
   void pushMember(MemberEntity member) {
     scopeInfoStack =
         scopeInfoStack.prepend(closureDataLookup.getScopeInfo(member));
     capturedScope = closureDataLookup.getCapturedScope(member);
+    closureRepresentationInfoStack = closureRepresentationInfoStack
+        .prepend(closureDataLookup.getClosureInfoForMemberTesting(member));
     dump(member);
   }
 
   void popMember() {
     scopeInfoStack = scopeInfoStack.tail;
+    closureRepresentationInfoStack = closureRepresentationInfoStack.tail;
   }
 
   void pushLocalFunction(T node) {
     closureRepresentationInfoStack = closureRepresentationInfoStack
-        .prepend(closureDataLookup.getClosureInfo(node));
+        .prepend(closureDataLookup.getClosureInfoForTesting(node));
     dump(node);
   }
 
@@ -255,7 +254,7 @@ abstract class ComputeValueMixin<T> {
     return (features.toList()..sort()).join(',');
   }
 
-  String computeObjectValue(Object object) {
+  String computeEntityValue(Entity entity) {
     Map<String, String> features = <String, String>{};
 
     void addLocals(String name, forEach(f(Local local, _))) {
@@ -270,17 +269,17 @@ abstract class ComputeValueMixin<T> {
       String value = names.isEmpty ? null : '[${(names..sort()).join(',')}]';
       if (features.containsKey(name)) {
         Expect.equals(
-            features[name], value, "Inconsistent values for $name on $object.");
+            features[name], value, "Inconsistent values for $name on $entity.");
       }
       features[name] = value;
     }
 
-    if (object is MemberEntity) {
-      if (scopeInfo.thisLocal != null) {
-        features['hasThis'] = '';
-      }
-      addLocals('boxed', scopeInfo.forEachBoxedVariable);
+    if (scopeInfo.thisLocal != null) {
+      features['hasThis'] = '';
+    }
+    addLocals('boxed', scopeInfo.forEachBoxedVariable);
 
+    if (entity is MemberEntity) {
       if (capturedScope.requiresContextBox) {
         features['requiresBox'] = '';
       }