pkg/compiler/lib/src/js_emitter/new_emitter/model_emitter.dart - Issue 1126423002: Avoid reparsing metadata expressions

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

Issue 1126423002: Avoid reparsing metadata expressions (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 5 years, 7 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

« pkg/compiler/lib/src/js_emitter/metadata_collector.dart ('K') | « pkg/compiler/lib/src/js_emitter/model.dart ('k') | pkg/compiler/lib/src/js_emitter/old_emitter/emitter.dart » ('j') | tests/compiler/dart2js_extra/23404_test.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 23646b7d6436cf3c52d6c31c6a86da2415abb94e..310a0061fbf7c84f621da9d0ca7e9e884f25500d 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

@@ -134,7 +134,8 @@ class ModelEmitter {

// deferred hash (which depends on the output) when emitting the main

// fragment.

fragments.skip(1).forEach((DeferredFragment deferredUnit) {

- List<String> types = program.metadataTypes[deferredUnit.outputUnit];

+ List<js.Expression> types =

+ program.metadataTypes[deferredUnit.outputUnit];

js.Expression ast = emitDeferredFragment(types, deferredUnit,

program.holders);

String code = js.prettyPrint(ast, compiler).getText();

@@ -420,23 +421,20 @@ class ModelEmitter {

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);

+ js.Property createGlobal(List<js.Expression> list, String global) {

floitsch 2015/05/07 01:14:29 It's simple enough now, that I would inline it. Bu

Siggi Cherem (dart-lang) 2015/05/07 16:29:23 Done.

+ return new js.Property(js.string(global), new js.ArrayInitializer(list));

}

metadataGlobals.add(createGlobal(program.metadata, METADATA));

- List<String> types =

+ List<js.Expression> types =

program.metadataTypes[program.fragments.first.outputUnit];

- if (types == null) types = <String>[];

+ if (types == null) types = <js.Expression>[];

metadataGlobals.add(createGlobal(types, TYPES));

return metadataGlobals;

}

- js.Expression emitDeferredFragment(List<String> types,

+ js.Expression emitDeferredFragment(List<js.Expression> types,

DeferredFragment fragment,

List<Holder> holders) {

// TODO(floitsch): initialize eager classes.

@@ -460,9 +458,9 @@ class ModelEmitter {

js.LiteralString immediateString = unparse(compiler, immediateCode);

- js.Expression deferredTypes = types == null

- ? js.string("[]")

- : js.string("[${types.join(",")}]");

+ js.Expression deferredTypes = js.string(types == null

+ ? "[]"

+ : js.prettyPrint(new js.ArrayInitializer(types), compiler).getText());

floitsch 2015/05/07 01:14:29 Use `unparse`. It does the js.string and pretty-pr

Siggi Cherem (dart-lang) 2015/05/07 16:29:23 Done.

js.ArrayInitializer hunk =

new js.ArrayInitializer([deferredArray, immediateString,