Use better names for closures and static variables.

lib/compiler/implementation/ssa/closure.dart

 // Copyright (c) 2012, 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.
 
 class ClosureFieldElement extends Element {
   ClosureFieldElement(SourceString name, ClassElement enclosing)
       : super(name, ElementKind.FIELD, enclosing);
 
   bool isInstanceMember() => true;
   bool isAssignable() => false;
 
   String toString() => "ClosureFieldElement($name)";
 }
 
 class ClosureClassElement extends ClassElement {
-  ClosureClassElement(Compiler compiler, Element enclosingElement)
-      : super(compiler.closureClass.name,
+  ClosureClassElement(SourceString name,
+                      Compiler compiler,
+                      Element enclosingElement)
+      : super(name,
               enclosingElement,
               // By assigning a fresh class-id we make sure that the hashcode
-              // is unique, but also emit closure class after all other
+              // is unique, but also emit closure classes after all other
               // classes (since the emitter sorts classes by their id).
               compiler.getNextFreeClassId()) {
     isResolved = true;
     compiler.closureClass.ensureResolved(compiler);
     supertype = compiler.closureClass.computeType(compiler);
   }
+  bool isClosure() => true;
 }
 
 class BoxElement extends Element {
   BoxElement(SourceString name, Element enclosingElement)
       : super(name, ElementKind.VARIABLE, enclosingElement);
 }
 
 class ThisElement extends Element {
   ThisElement(Element enclosing)
       : super(const SourceString('this'), ElementKind.PARAMETER, enclosing);
@@ skipping 309 matching lines @@
          link = link.tail) {
       Node definition = link.head;
       Element element = elements[definition];
       if (capturedVariableMapping.containsKey(element)) {
         result.add(element);
       };
     }
     scopeData.boxedLoopVariables = result;
   }
 
-  ClosureData globalizeClosure(FunctionExpression node) {
-    FunctionElement element = elements[node];
-    ClassElement globalizedElement =
-        new ClosureClassElement(compiler, element.getCompilationUnit());
+  ClosureData globalizeClosure(FunctionExpression node, Element element) {
+    SourceString closureName =
+        new SourceString(compiler.namer.closureName(element));
+    ClassElement globalizedElement = new ClosureClassElement(
+        closureName, compiler, element.getCompilationUnit());
     FunctionElement callElement =
         new FunctionElement.from(compiler.namer.CLOSURE_INVOCATION_NAME,
                                  element,
                                  globalizedElement);
     globalizedElement.backendMembers =
         const EmptyLink<Element>().prepend(callElement);
     // The nested function's 'this' is the same as the one for the outer
     // function. It could be [null] if we are inside a static method.
     Element thisElement = closureData.thisElement;
     return new ClosureData(element, globalizedElement,
@@ skipping 11 matching lines @@
 
     if (isClosure) closures.add(node);
 
     bool oldInsideClosure = insideClosure;
     FunctionElement oldFunctionElement = currentFunctionElement;
     ClosureData oldClosureData = closureData;
 
     insideClosure = isClosure;
     currentFunctionElement = elements[node];
     if (insideClosure) {
-      closureData = globalizeClosure(node);
+      closureData = globalizeClosure(node, element);
     } else {
       Element thisElement = null;
       // TODO(floitsch): we should not need to look for generative constructors.
       // At the moment we store only one ClosureData for both the factory and
       // the body.
       if (element.isInstanceMember() ||
           element.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
         // TODO(floitsch): currently all variables are considered to be
         // declared in the GENERATIVE_CONSTRUCTOR. Including the 'this'.
         Element thisEnclosingElement = element;
@@ skipping 58 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }