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

pkg/compiler/lib/src/js_emitter/program_builder.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.
 
 library dart2js.js_emitter.program_builder;
 
 import 'js_emitter.dart' show computeMixinClass;
 import 'model.dart';
 
 import '../common.dart';
@@ skipping 529 matching lines @@
       //               this information anyway as they cannot be torn off or
       //               reflected.
       var body = element;
       memberType = body.constructor.type;
     } else {
       memberType = element.type;
     }
 
     js.Expression functionType;
     if (canTearOff || canBeReflected) {
-      functionType = _generateFunctionType(memberType);
+      OutputUnit outputUnit =
+          _compiler.deferredLoadTask.outputUnitForElement(element);
+      functionType = _generateFunctionType(memberType, outputUnit);
     }
 
     int requiredParameterCount;
     var /* List | Map */ optionalParameterDefaultValues;
     if (canBeApplied || canBeReflected) {
       FunctionSignature signature = element.functionSignature;
       requiredParameterCount = signature.requiredParameterCount;
       optionalParameterDefaultValues =
           _computeParameterDefaultValues(signature);
     }
 
     return new InstanceMethod(element, name, code,
         _generateParameterStubs(element, canTearOff), callName,
         needsTearOff: canTearOff, tearOffName: tearOffName,
         isClosure: isClosure, aliasName: aliasName,
         canBeApplied: canBeApplied, canBeReflected: canBeReflected,
         requiredParameterCount: requiredParameterCount,
         optionalParameterDefaultValues: optionalParameterDefaultValues,
         functionType: functionType);
   }
 
-  js.Expression _generateFunctionType(DartType type) {
+  js.Expression _generateFunctionType(DartType type, OutputUnit outputUnit) {
     if (type.containsTypeVariables) {
       js.Expression thisAccess = js.js(r'this.$receiver');
       return backend.rti.getSignatureEncoding(type, thisAccess);
     } else {
-      return js.number(backend.emitter.metadataCollector.reifyType(type));
+      return js.number(backend.emitter.metadataCollector.
+          reifyTypeForOutputUnit(type, outputUnit));
     }
   }
 
   List<ParameterStubMethod> _generateParameterStubs(FunctionElement element,
                                                     bool canTearOff) {
 
     if (!_methodNeedsStubs(element)) return const <ParameterStubMethod>[];
 
     ParameterStubGenerator generator =
         new ParameterStubGenerator(_compiler, namer, backend);
@@ skipping 123 matching lines @@
 
     String callName = null;
     if (needsTearOff) {
       Selector callSelector =
           new Selector.fromElement(element).toCallSelector();
       callName = namer.invocationName(callSelector);
     }
     js.Expression functionType;
     DartType type = element.type;
     if (needsTearOff || canBeReflected) {
-      functionType = _generateFunctionType(type);
+      OutputUnit outputUnit =
+          _compiler.deferredLoadTask.outputUnitForElement(element);
+      functionType = _generateFunctionType(type, outputUnit);
     }
 
     int requiredParameterCount;
     var /* List | Map */ optionalParameterDefaultValues;
     if (canBeApplied || canBeReflected) {
       FunctionSignature signature = element.functionSignature;
       requiredParameterCount = signature.requiredParameterCount;
       optionalParameterDefaultValues =
           _computeParameterDefaultValues(signature);
     }
@@ skipping 22 matching lines @@
       _registry.registerConstant(outputUnit, constantValue);
       assert(!_constants.containsKey(constantValue));
       String name = namer.constantName(constantValue);
       String constantObject = namer.globalObjectForConstant(constantValue);
       Holder holder = _registry.registerHolder(constantObject);
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 }