dart2js: split out types from metadata.

pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.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.new_js_emitter.model_emitter;
 
 import '../../constants/values.dart' show ConstantValue, FunctionConstantValue;
 import '../../dart2jslib.dart' show Compiler;
 import '../../dart_types.dart' show DartType;
 import '../../elements/elements.dart' show ClassElement, FunctionElement;
@@ skipping 11 matching lines @@
     DEFERRED_LIBRARY_URIS,
     DEFERRED_LIBRARY_HASHES,
     GET_TYPE_FROM_NAME,
     INITIALIZE_LOADED_HUNK,
     INTERCEPTORS_BY_TAG,
     IS_HUNK_INITIALIZED,
     IS_HUNK_LOADED,
     LEAF_TAGS,
     MANGLED_GLOBAL_NAMES,
     METADATA,
-    TYPE_TO_INTERCEPTOR_MAP;
+    TYPE_TO_INTERCEPTOR_MAP,
+    TYPES;
 
 import '../js_emitter.dart' show NativeGenerator, buildTearOffCode;
 import '../model.dart';
 
 
 class ModelEmitter {
   final Compiler compiler;
   final Namer namer;
   ConstantEmitter constantEmitter;
   final NativeEmitter nativeEmitter;
@@ skipping 240 matching lines @@
       globals.add(
           new js.Property(js.string(CREATE_NEW_ISOLATE),
                           js.js('function () { return $isolateName; }')));
       // TODO(floitsch): add remaining isolate functions.
     }
 
     globals.add(emitMangledGlobalNames());
 
     globals.add(emitGetTypeFromName());
 
-    globals.add(emitMetadata(program));
+    globals.addAll(emitMetadata(program));
 
     if (program.needsNativeSupport) {
       globals.add(new js.Property(js.string(INTERCEPTORS_BY_TAG),
                                   js.js('Object.create(null)', [])));
       globals.add(new js.Property(js.string(LEAF_TAGS),
                                   js.js('Object.create(null)', [])));
     }
 
     js.ObjectInitializer globalsObject = new js.ObjectInitializer(globals);
 
@@ skipping 90 matching lines @@
   }
 
   js.Property emitGetTypeFromName() {
     js.Expression function =
         js.js( """function(name) {
                     return holdersMap[name][name].ensureResolved();
                   }""");
     return new js.Property(js.string(GET_TYPE_FROM_NAME), function);
   }
 
-  js.Property emitMetadata(Program program) {
-    String metadataList = "[${program.metadata.join(",")}]";
-    js.Expression metadata =
-        js.js.uncachedExpressionTemplate(metadataList).instantiate([]);
+  List<js.Property> emitMetadata(Program program) {
 
-    return new js.Property(js.string(METADATA), metadata);
+    List<js.Property> metadataGlobals = <js.Property>[];
+
+    js.Property createGlobal(List<String> list, String global) {
+      String listAsString = "[${list.join(",")}]";
+      js.Expression metadata =
+                js.js.uncachedExpressionTemplate(listAsString).instantiate([]);
+      return new js.Property(js.string(global), metadata);
+    }
+
+    metadataGlobals.add(createGlobal(program.metadata, METADATA));
+    metadataGlobals.add(createGlobal(program.metadataTypes, TYPES));
+
+    return metadataGlobals;
   }
 
   js.Expression emitDeferredFragment(DeferredFragment fragment,
                                      List<Holder> holders) {
     // TODO(floitsch): initialize eager classes.
     // TODO(floitsch): the hash must depend on the output.
     int hash = fragment.hashCode;
 
     List<js.Expression> deferredCode =
         fragment.libraries.map(emitLibrary).toList();
@@ skipping 655 matching lines @@
 
   var end = Date.now();
   // print('Setup: ' + (end - start) + ' ms.');
 
   #invokeMain;  // Start main.
 
 }(Date.now(), #code)
 }""";
 
 }