dart2js: create a 'types' table for each deferred unit.

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

 // Copyright (c) 2013, 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;
 
 class MetadataCollector {
   final Compiler _compiler;
   final Emitter _emitter;
 
   /// A list of JS expressions that represent metadata, parameter names and
   /// type variable types.
   final List<String> globalMetadata = <String>[];
 
   /// A map used to canonicalize the entries of globalMetadata.
   final Map<String, int> _globalMetadataMap = <String, int>{};
 
-  /// A list of JS expression representing types including function types and
-  /// typedefs.
-  final List<String> types = <String>[];
+  /// A map with lists of JS expressions, one list for each output unit. The
+  /// entries represent types including function types and typedefs.
+  final Map<OutputUnit, List<String>> types = <OutputUnit, List<String>>{};
 
   /// A map used to canonicalize the entries of types.
-  final Map<String, int> _typesMap = <String, int>{};
+  final Map<OutputUnit, Map<String, int>> _typesMap =
+      <OutputUnit, Map<String, int>>{};
 
   MetadataCollector(this._compiler, this._emitter);
 
   JavaScriptBackend get _backend => _compiler.backend;
   TypeVariableHandler get _typeVariableHandler => _backend.typeVariableHandler;
 
   bool _mustEmitMetadataFor(Element element) {
     return _backend.mustRetainMetadata &&
         _backend.referencedFromMirrorSystem(element);
   }
@@ skipping 50 matching lines @@
     if (constant == null) {
       _compiler.internalError(annotation, 'Annotation value is null.');
       return -1;
     }
     return addGlobalMetadata(
         jsAst.prettyPrint(
             _emitter.constantReference(constant.value), _compiler).getText());
   }
 
   int reifyType(DartType type) {
+    return reifyTypeForOutputUnit(type,
+                                  _compiler.deferredLoadTask.mainOutputUnit);
+  }
+
+  int reifyTypeForOutputUnit(DartType type, OutputUnit outputUnit) {
     jsAst.Expression representation =
         _backend.rti.getTypeRepresentation(
             type,
             (variable) {
               return js.number(
                   _typeVariableHandler.reifyTypeVariable(
                       variable.element));
             },
             (TypedefType typedef) {
               return _backend.isAccessibleByReflection(typedef.element);
             });
 
-    return addType(
-        jsAst.prettyPrint(representation, _compiler).getText());
+    return addTypeInOutputUnit(
+        jsAst.prettyPrint(representation, _compiler).getText(), outputUnit);
   }
 
   int reifyName(String name) {
     return addGlobalMetadata('"$name"');
   }
 
   int addGlobalMetadata(String string) {
     return _globalMetadataMap.putIfAbsent(string, () {
       globalMetadata.add(string);
       return globalMetadata.length - 1;
     });
   }
 
-  int addType(String compiledType) {
-    return _typesMap.putIfAbsent(compiledType, () {
-      types.add(compiledType);
-      return types.length - 1;
+  int addTypeInOutputUnit(String compiledType, OutputUnit outputUnit) {
+    if (_typesMap[outputUnit] == null) {
+      _typesMap[outputUnit] = <String, int>{};
+    }
+    return _typesMap[outputUnit].putIfAbsent(compiledType, () {
+
+      if (types[outputUnit] == null)
+        types[outputUnit] = <String>[];
+
+      types[outputUnit].add(compiledType);
+      return types[outputUnit].length - 1;
     });
   }
 
   List<int> computeMetadata(FunctionElement element) {
     return _compiler.withCurrentElement(element, () {
       if (!_mustEmitMetadataFor(element)) return const <int>[];
       List<int> metadata = <int>[];
       Link link = element.metadata;
       // TODO(ahe): Why is metadata sometimes null?
       if (link != null) {
         for (; !link.isEmpty; link = link.tail) {
           metadata.add(reifyMetadata(link.head));
         }
       }
       return metadata;
     });
   }
 }