Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart

Issue 981143003: dart2js: split out types from metadata. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart b/pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart
index 9afa419b072f31cddda48e6782879f810e432bb1..280aed450a7e6ac2709643895faf52f5ddc5ac71 100644
--- a/pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart
@@ -29,7 +29,8 @@ import 'package:_internal/compiler/js_lib/shared/embedded_names.dart' show
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';
@@ -290,7 +291,7 @@ class ModelEmitter {
globals.add(emitGetTypeFromName());
- globals.add(emitMetadata(program));
+ globals.addAll(emitMetadata(program));
if (program.needsNativeSupport) {
globals.add(new js.Property(js.string(INTERCEPTORS_BY_TAG),
@@ -401,12 +402,21 @@ class ModelEmitter {
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,
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/model.dart ('k') | pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698