dart2js: split out types from metadata.

pkg/compiler/lib/src/js_emitter/old_emitter/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.
 
 part of dart2js.js_emitter;
 
 
 class OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 833 matching lines @@
     // closure that constructs the initial value.
     return js('#(#,#,#,#,#)',
         [js(lazyInitializerName),
             js(isolateProperties),
             js.string(element.name),
             js.string(namer.globalPropertyName(element)),
             js.string(namer.lazyInitializerName(element)),
             code]);
   }
 
-  void emitMetadata(List<String> globalMetadata, CodeOutput output) {
-    String metadataAccess =
-        generateEmbeddedGlobalAccessString(embeddedNames.METADATA);
-    output.add('$metadataAccess$_=$_[');
-    for (String metadata in globalMetadata) {
-      if (metadata is String) {
-        if (metadata != 'null') {
-          output.add(metadata);
-        }
-      } else {
-        throw 'Unexpected value in metadata: ${Error.safeToString(metadata)}';
-      }
-      output.add(',$n');
-    }
-    output.add('];$n');
+  void emitMetadata(Program program, CodeOutput output) {
+
+   addMetadataGlobal(List<String> list, String global) {
+     String globalAccess = generateEmbeddedGlobalAccessString(global);
+     output.add('$globalAccess$_=$_[');
+     for (String data in list) {
+       if (data is String) {
+         if (data != 'null') {
+           output.add(data);
+         }
+       } else {
+         throw 'Unexpected value in ${global}: ${Error.safeToString(data)}';
+       }
+       output.add(',$n');
+     }
+     output.add('];$n');
+   }
+
+   addMetadataGlobal(program.metadata, embeddedNames.METADATA);
+   addMetadataGlobal(program.metadataTypes, embeddedNames.TYPES);
   }
 
   void emitCompileTimeConstants(CodeOutput output,
                                 List<Constant> constants,
                                 {bool isMainFragment}) {
     assert(isMainFragment != null);
 
     if (constants.isEmpty) return;
     CodeOutput constantOutput = output;
     if (compiler.hasIncrementalSupport && isMainFragment) {
@@ skipping 603 matching lines @@
     }
 
     // Static field initializations require the classes and compile-time
     // constants to be set up.
     emitStaticNonFinalFieldInitializations(mainOutput, mainOutputUnit);
     interceptorEmitter.emitTypeToInterceptorMap(program, mainOutput);
     emitLazilyInitializedStaticFields(mainOutput);
 
     mainOutput.add('\n');
 
-    emitMetadata(task.metadataCollector.globalMetadata, mainOutput);
+    emitMetadata(program, mainOutput);
 
     isolateProperties = isolatePropertiesName;
     // The following code should not use the short-hand for the
     // initialStatics.
     mainOutput.add('${namer.currentIsolate}$_=${_}null$N');
 
     emitFinishIsolateConstructorInvocation(mainOutput);
     mainOutput.add(
         '${namer.currentIsolate}$_=${_}new ${namer.isolateName}()$N');
 
@@ skipping 516 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }