Use Uris for corelibOrder

lib/src/codegen/js_codegen.dart

 // Copyright (c) 2015, 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.
 
 library js_codegen;
 
 import 'dart:collection' show HashSet, HashMap, SplayTreeSet;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
 import 'package:analyzer/src/generated/ast.dart' hide ConstantEvaluator;
@@ skipping 168 matching lines @@
     for (var elementIdPairs in _qualifiedIds) {
       var element = elementIdPairs.e0;
       var id = elementIdPairs.e1;
       id.setQualified(!_loader.isLoaded(element));
     }
 
     var moduleBuilder = new ModuleBuilder(options.moduleFormat);
 
     _exports.forEach(moduleBuilder.addExport);
 
+    var currentModuleName = compiler.getModuleName(currentLibrary.source.uri);
     var items = <JS.ModuleItem>[];
     if (!_isDartRuntime) {
       if (currentLibrary.source.isInSystemLibrary) {
         // Force the import order of runtime libs.
         // TODO(ochafik): Reduce this to a minimum.
-        for (var lib in corelibOrder.reversed) {
-          // TODO(ochafik): Use uris instead in corelibOrder.
-          moduleBuilder.addImport(getCorelibModuleName(lib), null);
+        for (var libUri in corelibOrder.reversed) {
+          var moduleName = compiler.getModuleName(libUri);
+          if (moduleName == currentModuleName) continue;
+          moduleBuilder.addImport(moduleName, null);
         }
       }
       moduleBuilder.addImport('dart/_runtime', _runtimeLibVar);
 
       var dartxImport =
           js.statement("let # = #.dartx;", [_dartxVar, _runtimeLibVar]);
       items.add(dartxImport);
     }
     items.addAll(_moduleItems);
 
     _imports.forEach((LibraryElement lib, JS.TemporaryId temp) {
       moduleBuilder.addImport(compiler.getModuleName(lib.source.uri), temp,
           isLazy: _isDartRuntime || !_loader.libraryIsLoaded(lib));
     });
 
     // TODO(jmesserly): scriptTag support.
     // Enable this if we know we're targetting command line environment?
     // It doesn't work in browser.
     // var jsBin = compiler.options.runnerOptions.v8Binary;
     // String scriptTag = null;
     // if (library.library.scriptTag != null) scriptTag = '/usr/bin/env $jsBin';
     return moduleBuilder.build(
-        compiler.getModuleName(currentLibrary.source.uri),
+        currentModuleName,
         _jsModuleValue,
         _exportsVar,
         items);
   }
 
   void _emitModuleItem(AstNode node) {
     // Attempt to group adjacent properties.
     if (node is! FunctionDeclaration) _flushLibraryProperties(_moduleItems);
 
     var code = _visit(node);
@@ skipping 3459 matching lines @@
 
 /// A special kind of element created by the compiler, signifying a temporary
 /// variable. These objects use instance equality, and should be shared
 /// everywhere in the tree where they are treated as the same variable.
 class TemporaryVariableElement extends LocalVariableElementImpl {
   TemporaryVariableElement.forNode(Identifier name) : super.forNode(name);
 
   int get hashCode => identityHashCode(this);
   bool operator ==(Object other) => identical(this, other);
 }