Unify private names treatment.

lib/compiler/implementation/dart_backend/renamer.dart

Index: lib/compiler/implementation/dart_backend/renamer.dart
diff --git a/lib/compiler/implementation/dart_backend/renamer.dart b/lib/compiler/implementation/dart_backend/renamer.dart
index 6cb47f76933ce788de7d7a7ba4b5556e60b75b84..31d28cf2b52f954af2015be83121ee87584791b1 100644
--- a/lib/compiler/implementation/dart_backend/renamer.dart
+++ b/lib/compiler/implementation/dart_backend/renamer.dart
@@ -14,14 +14,6 @@ void renamePlaceholders(
   final Map<LibraryElement, Map<String, String>> renamed
       = new Map<LibraryElement, Map<String, String>>();
   final Set<String> usedTopLevelIdentifiers = new Set<String>();
-  int privateNameCounter = 0;
-
-  String getName(LibraryElement library, String originalName, renamer) =>
-      renamed.putIfAbsent(library, () => <String>{})
-          .putIfAbsent(originalName, renamer);
-
-  String renamePrivateIdentifier(LibraryElement library, String id) =>
-      getName(library, id, () => '_${privateNameCounter++}${id}');
 
   Generator topLevelGenerator =
       true ? conservativeGenerator : new MinifyingGenerator('ABCD').generate;
@@ -32,6 +24,10 @@ void renamePlaceholders(
     return newName;
   }
 
+  rename(library, originalName) =>
+      renamed.putIfAbsent(library, () => <String>{})
+          .putIfAbsent(originalName, () => generateUniqueName(originalName));

[Roman, 2012/08/21 07:34:17]

I don't understand this. Earlier we had different prefixes for private
identifiers that appear in different libraries. Now they may be equal, but I
don't think that's what we want.

+
   String renameElement(Element element) {
     assert(element.isTopLevel());
     // TODO(smok): Make sure that the new name does not conflict with existing
@@ -46,8 +42,7 @@ void renamePlaceholders(
       return '$prefix.$originalName';
     }
 
-    return getName(library, originalName,
-                   () => generateUniqueName(originalName));
+    return rename(library, originalName);
   }
 
   placeholderCollector.nullNodes.forEach((Node node) {
@@ -76,8 +71,7 @@ void renamePlaceholders(
   placeholderCollector.privateNodes.forEach(
       (LibraryElement library, Set<Identifier> nodes) {
         nodes.forEach((Identifier node) {
-          renames[node] =
-              renamePrivateIdentifier(library, node.source.slowToString());
+          renames[node] = rename(library, node.source.slowToString());
         });
   });
 }