dart2js: register output units explicitly in the program builder.

pkg/compiler/lib/src/js_emitter/registry.dart

 // Copyright (c) 2014, 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.
 
 part of dart2js.js_emitter.program_builder;
 
 /// Maps [LibraryElement]s to their [Element]s.
 ///
 /// Fundamentally, this class nicely encapsulates a
 /// `Map<LibraryElement, List<Element>>`.
@@ skipping 60 matching lines @@
   LibrariesMap mainLibrariesMap;
 
   Registry(this._compiler);
 
   bool get _isProgramSplit => _deferredLoadTask.isProgramSplit;
   OutputUnit get _mainOutputUnit => _deferredLoadTask.mainOutputUnit;
 
   LibrariesMap _mapUnitToLibrariesMap(OutputUnit targetUnit) {
     if (targetUnit == _lastOutputUnit) return _lastLibrariesMap;
 
-    if (mainLibrariesMap == null) {
-      mainLibrariesMap =
-          new LibrariesMap.main(_deferredLoadTask.mainOutputUnit);
-    }
+    LibrariesMap result = (targetUnit == _mainOutputUnit)
+        ? mainLibrariesMap
+        : _deferredLibrariesMap[targetUnit];
 
-    LibrariesMap result;
-    if (targetUnit == _mainOutputUnit) {
-      result = mainLibrariesMap;
-    } else {
-      String name = targetUnit.name;
-      result = _deferredLibrariesMap.putIfAbsent(
-          targetUnit, () => new LibrariesMap.deferred(targetUnit, name));
-    }
+    assert(result != null);
     _lastOutputUnit = targetUnit;
     _lastLibrariesMap = result;
     return result;
   }
 
+  void registerOutputUnit(OutputUnit outputUnit) {
+    if (outputUnit == _mainOutputUnit) {
+      assert(mainLibrariesMap == null);
+      mainLibrariesMap =
+          new LibrariesMap.main(_deferredLoadTask.mainOutputUnit);
+    } else {
+      assert(!_deferredLibrariesMap.containsKey(outputUnit));
+      String name = outputUnit.name;
+      _deferredLibrariesMap[outputUnit] =
+          new LibrariesMap.deferred(outputUnit, name);
+    }
+  }
+
   /// Adds all elements to their respective libraries in the correct
   /// libraries map.
   void registerElements(OutputUnit outputUnit, List<Element> elements) {
     LibrariesMap targetLibrariesMap = _mapUnitToLibrariesMap(outputUnit);
     for (Element element in Elements.sortedByPosition(elements)) {
       targetLibrariesMap.add(element.library, element);
     }
   }
 
   void registerConstant(OutputUnit outputUnit, ConstantValue constantValue) {
-    // We just need to make sure that the target library map is registered.
-    // Otherwise a library map that contains only constants is not built.
-    _mapUnitToLibrariesMap(outputUnit);
+    // Ignore for now.
   }
 
   Holder registerHolder(String name) {
     return _holdersMap.putIfAbsent(
         name,
         () => new Holder(name, _holdersMap.length));
   }
 }