Rename elements after sorting.

lib/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.
 
 /**
  * Renames only top-level elements that would let to ambiguity if not renamed.
  * TODO(smok): Make sure that top-level fields are correctly renamed.
  */
 void renamePlaceholders(
     Compiler compiler,
@@ skipping 26 matching lines @@
     if (isDartCoreLib(compiler, library)) {
       final prefix =
           imports.putIfAbsent(library, () => generateUniqueName('p'));
       return '$prefix.$originalName';
     }
 
     return rename(library, originalName);
   }
 
   renameNodes(Collection<Node> nodes, renamer) {
-    for (Node node in nodes) {
+    final comparison = compareBy((node) => node.getBeginToken().charOffset);
+    for (Node node in sorted(nodes, comparison)) {
       renames[node] = renamer(node);
     }
   }
 
+  sortedForEach(Map<Element, Dynamic> map, f) {
+    for (Element element in sortElements(map.getKeys())) {
+      f(element, map[element]);
+    }
+  }
+
   renameNodes(placeholderCollector.nullNodes, (_) => '');
   renameNodes(placeholderCollector.unresolvedNodes,
       (_) => generateUniqueName('Unresolved'));
-  placeholderCollector.elementNodes.forEach(
-      (Element element, Set<Node> nodes) {
-        String renamedElement = renameElement(element);
-        renameNodes(nodes, (_) => renamedElement);
+  sortedForEach(placeholderCollector.elementNodes, (element, nodes) {
+    String renamedElement = renameElement(element);
+    renameNodes(nodes, (_) => renamedElement);
   });
-  placeholderCollector.localPlaceholders.forEach(
-      (FunctionElement element, Set<LocalPlaceholder> localPlaceholders) {
-        // TODO(smok): Check for conflicts with class fields and take usages
-        // into account.
-        localPlaceholders.forEach((LocalPlaceholder placeholder) {
-          renameNodes(placeholder.nodes, (_) => placeholder.identifier);
-        });
-      });
-  placeholderCollector.privateNodes.forEach(
-      (LibraryElement library, Set<Identifier> nodes) {
-        renameNodes(nodes, (node) =>
-            rename(library, node.source.slowToString()));
+  sortedForEach(placeholderCollector.localPlaceholders,
+      (element, placeholders) {
+    // TODO(smok): Check for conflicts with class fields and take usages
+    // into account.
+    for (LocalPlaceholder placeholder in placeholders) {
+      renameNodes(placeholder.nodes, (_) => placeholder.identifier);
+    }
+  });
+  sortedForEach(placeholderCollector.privateNodes, (library, nodes) {
+    renameNodes(nodes, (node) => rename(library, node.source.slowToString()));
   });
 }
 
 typedef String Generator(String originalName, bool isForbidden(String name));
 
 /** Always tries to return original identifier name unless it is forbidden. */
 String conservativeGenerator(
     String originalName, bool isForbidden(String name)) {
   String newName = originalName;
   while (isForbidden(newName)) {
@@ skipping 29 matching lines @@
     int length = alphabet.length;
     StringBuffer resultBuilder = new StringBuffer();
     while (index >= length) {
       resultBuilder.add(alphabet[index % length]);
       index ~/= length;
     }
     resultBuilder.add(alphabet[index]);
     return resultBuilder.toString();
   }
 }