Fix for http://code.google.com/p/dart/issues/detail?id=1363: use the simplename for the key, not ...

dart/frog/world.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.
 
 /** The one true [World]. */
 World world;
 
 /**
  * Experimental phase to enable await, only set when using the
  * await/awaitc.dart entrypoint.
@@ skipping 260 matching lines @@
     int existingPri = existing.jsnamePriority;
     int namedPri = named.jsnamePriority;
     if (existingPri > namedPri || namedPri == 0) {
       // Either existing was higher priority, or they're both 0 so first one
       // wins.
       _renameJavascriptTopName(named);
     } else if (namedPri > existingPri) {
       // New one takes priority over existing
       _renameJavascriptTopName(existing);
     } else {
       final msg = 'conflicting JS name "$name" of same '

[kasperl, 2012/02/08 14:00:32]

Only compute the msg in the case named.isNative.

[ngeoffray, 2012/02/08 16:34:01]

Done.

           + 'priority $existingPri: (already defined in) '
           + '${existing.span.locationText} with priority $namedPri)';
       if (named.isNative) {
         // We trust that conflicting native names in builtin libraries are
         // harmless. Most cases there are no conflicts, currently isolates
         // in coreimpl and dart:dom both define web workers to avoid adding a
         // dependency from corelib to dart:dom.
         world.info(msg, named.span, existing.span);
       } else {
-        // Conflicting name in corelib needs to be fixed.
-        world.internalError(msg, named.span, existing.span);
+        // Conflicting js name in same library. This happens because
+        // of two different type arguments with the same name but in
+        // different libraries.
+        _renameJavascriptTopName(existing);
       }
     }
   }
 
   /** Renames an [Element] that had a name conflict in the generated JS. */
   _renameJavascriptTopName(Element named) {
     named._jsname = '${named.library.jsname}_${named.jsname}';
     final existing = _topNames[named.jsname];
     if (existing != null && existing != named) {
       // If this happens it means the library name wasn't unique enough.
@@ skipping 321 matching lines @@
 
   withTiming(String name, f()) {
     final sw = new Stopwatch();
     sw.start();
     var result = f();
     sw.stop();
     info('$name in ${sw.elapsedInMs()}msec');
     return result;
   }
 }