Only emit members in mirror helper symbolsmap.

sdk/lib/_internal/compiler/implementation/dart_backend/renamer.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.
 
 part of dart_backend;
 
 Function get _compareNodes =>
     compareBy((n) => n.getBeginToken().charOffset);
 
 typedef String _Renamer(Renamable renamable);
@@ skipping 162 matching lines @@
     forbiddenIdentifiers.addAll(Keyword.keywords.keys);
     forbiddenIdentifiers.addAll(fixedMemberNames);
     generateUniqueName = (_) =>
         generator.generate((name) =>
             forbiddenIdentifiers.contains(name)
             || allNamedParameterIdentifiers.contains(name));
     rename = makeRenamer(generateUniqueName);
     renameElement = makeElementRenamer(rename, generateUniqueName);
 
     List<Set<Node>> allLocals = new List<Set<Node>>();
-    // If we are using the mirror_helper library we need all names to be
-    // globally unique.
-    if (uniqueGlobalNaming) {
-      //TODO(zarah): Change this so that local variables don't get unique names.
-      for (var functionScope in placeholderCollector.functionScopes.values) {
-        functionScope.localPlaceholders.forEach(
-            (ph) => allLocals.add(ph.nodes.toSet()));
+
+    // Build a sorted (by usage) list of local nodes that will be renamed to

[Johnni Winther, 2013/08/28 07:04:23]

"a sorted ... local nodes" -> "a list sorted by usage of local nodes"?

[zarah, 2013/08/28 10:18:14]

Done.

+    // the same identifier. So the top-used local variables in all functions
+    // will be renamed first and will all share the same new identifier.
+    for (var functionScope in placeholderCollector.functionScopes.values) {
+      // Add current sorted local identifiers to the whole sorted list
+      // of all local identifiers for all functions.
+      List<LocalPlaceholder> currentSortedPlaceholders =
+          sorted(functionScope.localPlaceholders,
+              compareBy((LocalPlaceholder ph) => -ph.nodes.length));
+      List<Set<Node>> currentSortedNodes =
+          currentSortedPlaceholders.map((ph) => ph.nodes).toList();
+      // Make room in all sorted locals list for new stuff.
+      while (currentSortedNodes.length > allLocals.length) {
+        allLocals.add(new Set<Node>());
       }
-    } else {
-      // Build a sorted (by usage) list of local nodes that will be renamed to
-      // the same identifier. So the top-used local variables in all functions
-      // will be renamed first and will all share the same new identifier.
-      for (var functionScope in placeholderCollector.functionScopes.values) {
-        // Add current sorted local identifiers to the whole sorted list
-        // of all local identifiers for all functions.
-        List<LocalPlaceholder> currentSortedPlaceholders =
-            sorted(functionScope.localPlaceholders,
-                compareBy((LocalPlaceholder ph) => -ph.nodes.length));
-        List<Set<Node>> currentSortedNodes =
-            currentSortedPlaceholders.map((ph) => ph.nodes).toList();
-        // Make room in all sorted locals list for new stuff.
-        while (currentSortedNodes.length > allLocals.length) {
-          allLocals.add(new Set<Node>());
-        }
-        for (int i = 0; i < currentSortedNodes.length; i++) {
-          allLocals[i].addAll(currentSortedNodes[i]);
-        }
+      for (int i = 0; i < currentSortedNodes.length; i++) {
+        allLocals[i].addAll(currentSortedNodes[i]);
       }
     }
 
     // Rename elements, members and locals together based on their usage count,
     // otherwise when we rename elements first there will be no good identifiers
     // left for members even if they are used often.
     String elementRenamer(ElementRenamable elementRenamable) =>
         renameElement(elementRenamable.element);
     String memberRenamer(MemberRenamable memberRenamable) =>
         generator.generate(forbiddenIdentifiers.contains);
@@ skipping 138 matching lines @@
     index ~/= firstCharAlphabet.length;
     int length = otherCharsAlphabet.length;
     while (index >= length) {
       resultBuilder.write(otherCharsAlphabet[index % length]);
       index ~/= length;
     }
     resultBuilder.write(otherCharsAlphabet[index]);
     return resultBuilder.toString();
   }
 }