Fix for issue with incorrectly renamed private names.

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 function $defProp(obj, prop, value) {
   Object.defineProperty(obj, prop,
       {value: value, enumerable: false, writable: true, configurable: true});
 }
 Function.prototype.bind = Function.prototype.bind ||
   function(thisObj) {
     var func = this;
@@ skipping 5565 matching lines @@
     }
     else {
       var members = this._privateMembers.$index(member.name);
       if ($eq$(members)) {
         members = new MemberSet(member, true);
         this._privateMembers.$setindex(member.name, members);
       }
       else {
         members.add(member);
       }
-      this._makePrivateMembersUnique(member, members);
     }
   }
   else {
     $globals.world._addMember(member);
   }
 }
-Library.prototype._makePrivateMembersUnique = function(member, members) {
-  if (members.jsnameUnique) {
-    member._jsname = members.jsname;
-    return;
-  }
-  var name = members.name;
-  var $$list = $globals.world.libraries.getValues();
-  for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
-    var lib = $$i.next();
-    if ((null == lib ? null != (this) : lib !== this) && lib.get$_privateMembers().containsKey(name)) {
-      var uniqueName = ("_" + this.get$jsname() + members.jsname);
-      members.jsname = uniqueName;
-      members.jsnameUnique = true;
-      members.members.forEach((function (uniqueName, each) {
-        each.set$_jsname(uniqueName);
-      }).bind(null, uniqueName)
-      );
-      return;
-    }
-  }
-}
 Library.prototype.getOrAddFunctionType = function(enclosingElement, name, func, data) {
   var def = new FunctionTypeDefinition(func, null, func.span);
   var type = new DefinedType(name, this, def, false);
   type.addMethod(":call", func);
   var m = type.get$members().$index(":call");
   m.set$enclosingElement(enclosingElement);
   m.resolve();
   m.set$_methodData(data);
   type.set$interfaces([$globals.world.functionType]);
   return type;
@@ skipping 1277 matching lines @@
   return this.factories.getValues().every((function (constructors) {
     return constructors.isEmpty();
   })
   );
 }
 // ********** Code for MemberSet **************
 function MemberSet(member, isVar) {
   this.jsname = member.get$jsname();
   this.name = member.name;
   this._preparedForSet = false;
-  this.jsnameUnique = false;
   this.isVar = isVar;
   this.members = [member];
 }
 MemberSet.prototype.get$name = function() { return this.name; };
 MemberSet.prototype.get$members = function() { return this.members; };
 MemberSet.prototype.get$isVar = function() { return this.isVar; };
 MemberSet.prototype.get$jsname = function() { return this.jsname; };
+MemberSet.prototype.set$jsname = function(value) { return this.jsname = value; };
 MemberSet.prototype.toString = function() {
   return ("" + this.name + ":" + this.members.get$length());
 }
 MemberSet.prototype.add = function(member) {
   this.members.add(member);
 }
 MemberSet.prototype.get$isOperator = function() {
   return this.members.$index((0)).get$isOperator();
 }
 MemberSet.prototype.get$treatAsField = function() {
@@ skipping 7252 matching lines @@
   }
   return res;
 }
 World.prototype.runCompilationPhases = function() {
   var $this = this; // closure support
   var lib = this.withTiming("first pass", (function () {
     return $this.processDartScript();
   })
   );
   this.withTiming("resolve top level", this.get$resolveAll());
+  this.withTiming("privatization", (function () {
+    $this.makePrivateMembersUnique(lib);
+  })
+  );
   if ($globals.experimentalAwaitPhase != null) {
     this.withTiming("await translation", to$call$0($globals.experimentalAwaitPhase));
   }
   this.withTiming("analyze pass", (function () {
     $this.analyzeCode(lib);
   })
   );
   if ($globals.options.checkOnly) return;
   this.withTiming("generate code", (function () {
     $this.generateCode(lib);
@@ skipping 65 matching lines @@
   }
   var $$list = this.libraries.getValues();
   for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
     var lib = $$i.next();
     lib.postResolveChecks();
   }
 }
 World.prototype.get$resolveAll = function() {
   return this.resolveAll.bind(this);
 }
+World.prototype.makePrivateMembersUnique = function(rootLib) {
+  var usedNames = new HashSetImplementation_dart_core_String();
+  function process(lib) {
+    var $$list = lib.get$_privateMembers().getKeys();
+    for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
+      var name = $$i.next();
+      if (usedNames.contains$1(name)) {
+        var members = lib.get$_privateMembers().$index(name);
+        var uniqueName = ("_" + lib.get$jsname() + members.get$jsname());
+        members.set$jsname(uniqueName);
+        var $list0 = members.get$members();
+        for (var $i0 = $list0.iterator(); $i0.hasNext(); ) {
+          var member = $i0.next();
+          member.set$_jsname(uniqueName);
+        }
+      }
+      else {
+        usedNames.add(name);
+      }
+    }
+  }
+  var visited = new HashSetImplementation_Library();
+  function visit(lib) {
+    if (visited.contains$1(lib)) return;
+    visited.add(lib);
+    process(lib);
+    var $$list = lib.get$imports();
+    for (var $$i = $$list.iterator(); $$i.hasNext(); ) {
+      var import_ = $$i.next();
+      visit(import_.get$library());
+    }
+  }
+  visit(rootLib);
+}
 World.prototype.findMainMethod = function(lib) {
   var main = lib.lookup("main", lib.get$span());
   if ($eq$(main)) {
     if (!$globals.options.checkOnly) this.fatal("no main method specified");
   }
   return main;
 }
 World.prototype.analyzeCode = function(lib) {
   this.gen = new WorldGenerator(this.findMainMethod(lib), new CodeWriter());
   this.gen.analyze();
@@ skipping 603 matching lines @@
 var const$0002 = Object.create(EmptyQueueException.prototype, {});
 var const$0006 = Object.create(IllegalAccessException.prototype, {});
 var const$0007 = ImmutableList.ImmutableList$from$factory([]);
 var const$0009 = new JSSyntaxRegExp("^[a-zA-Z]:/");
 var const$0010 = ImmutableList.ImmutableList$from$factory(["__PROTO__", "prototype", "constructor"]);
 var const$0011 = ImmutableList.ImmutableList$from$factory(["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNan", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "arguments", "escape", "unescape", "applicationCache", "closed", "Components", "content", "controllers", "crypto", "defaultStatus", "dialogArguments", "directories", "document", "frameElement", "frames", "fullScreen", "globalStorage", "history", "innerHeight", "innerWidth", "length", "location", "locationbar", "localStorage", "menubar", "mozInnerScreenX", "mozInnerScreenY", "mozScreenPixelsPerCssPixel", "name", "navigator", "opener", "outerHeight", "outerWidth", "pageXOffset", "pageYOffset", "parent", "personalbar", "pkcs11", "returnValue", "screen", "scrollbars", "scrollMaxX", "scrollMaxY", "self", "sessionStorage", "sidebar", "status", "statusbar", "toolbar", "top", "window", "alert", "addEventListener", "atob", "back", "blur", "btoa", "captureEvents", "clearInterval", "clearTimeout", "close", "confirm", "disableExternalCapture", "dispatchEvent", "dump", "enableExternalCapture", "escape", "find", "focus", "forward", "GeckoActiveXObject", "getAttention", "getAttentionWithCycleCount", "getComputedStyle", "getSelection", "home", "maximize", "minimize", "moveBy", "moveTo", "open", "openDialog", "postMessage", "print", "prompt", "QueryInterface", "releaseEvents", "removeEventListener", "resizeBy", "resizeTo", "restore", "routeEvent", "scroll", "scrollBy", "scrollByLines", "scrollByPages", "scrollTo", "setInterval", "setResizeable", "setTimeout", "showModalDialog", "sizeToContent", "stop", "uuescape", "updateCommands", "XPCNativeWrapper", "XPCSafeJSOjbectWrapper", "onabort", "onbeforeunload", "onchange", "onclick", "onclose", "oncontextmenu", "ondragdrop", "onerror", "onfocus", "onhashchange", "onkeydown", "onkeypress", "onkeyup", "onload", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onmozorientation", "onpaint", "onreset", "onresize", "onscroll", "onselect", "onsubmit", "onunload", "ontouchcancel", "ontouchend", "ontouchmove", "ontouchstart", "ongesturestart", "ongesturechange", "ongestureend", "uneval", "getPrototypeOf", "let", "yield", "abstract", "int", "short", "boolean", "interface", "static", "byte", "long", "char", "final", "native", "synchronized", "float", "package", "throws", "goto", "private", "transient", "implements", "protected", "volatile", "double", "public", "attachEvent", "clientInformation", "clipboardData", "createPopup", "dialogHeight", "dialogLeft", "dialogTop", "dialogWidth", "onafterprint", "onbeforedeactivate", "onbeforeprint", "oncontrolselect", "ondeactivate", "onhelp", "onresizeend", "event", "external", "Debug", "Enumerator", "Global", "Image", "ActiveXObject", "VBArray", "Components", "toString", "getClass", "constructor", "prototype", "valueOf", "Anchor", "Applet", "Attr", "Canvas", "CanvasGradient", "CanvasPattern", "CanvasRenderingContext2D", "CDATASection", "CharacterData", "Comment", "CSS2Properties", "CSSRule", "CSSStyleSheet", "Document", "DocumentFragment", "DocumentType", "DOMException", "DOMImplementation", "DOMParser", "Element", "Event", "ExternalInterface", "FlashPlayer", "Form", "Frame", "History", "HTMLCollection", "HTMLDocument", "HTMLElement", "IFrame", "Image", "Input", "JSObject", "KeyEvent", "Link", "Location", "MimeType", "MouseEvent", "Navigator", "Node", "NodeList", "Option", "Plugin", "ProcessingInstruction", "Range", "RangeException", "Screen", "Select", "Table", "TableCell", "TableRow", "TableSelection", "Text", "TextArea", "UIEvent", "Window", "XMLHttpRequest", "XMLSerializer", "XPathException", "XPathResult", "XSLTProcessor", "java", "Packages", "netscape", "sun", "JavaObject", "JavaClass", "JavaArray", "JavaMember", "$wnd", "$doc", "$entry", "$moduleName", "$moduleBase", "$gwt_version", "$sessionId", "$stack", "$stackDepth", "$location", "call"]);
 var const$0012 = ImmutableList.ImmutableList$from$factory(["break", "delete", "function", "return", "typeof", "case", "do", "if", "switch", "var", "catch", "else", "in", "this", "void", "continue", "false", "instanceof", "throw", "while", "debugger", "finally", "new", "true", "with", "default", "for", "null", "try", "abstract", "double", "goto", "native", "static", "boolean", "enum", "implements", "package", "super", "byte", "export", "import", "private", "synchronized", "char", "extends", "int", "protected", "throws", "class", "final", "interface", "public", "transient", "const", "float", "long", "short", "volatile"]);
 var $globals = {};
 $static_init();
 main();