lib/compiler/implementation/js_backend/emitter.dart - Issue 11265020: Minifying renamer for classes, methods and instance variables.

Unified Diff: lib/compiler/implementation/js_backend/emitter.dart

Issue 11265020: Minifying renamer for classes, methods and instance variables. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

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

« lib/compiler/implementation/js/printer.dart ('K') | « lib/compiler/implementation/js_backend/backend.dart ('k') | lib/compiler/implementation/js_backend/emitter_no_eval.dart » ('j') | lib/compiler/implementation/js_backend/minify_namer.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: lib/compiler/implementation/js_backend/emitter.dart

diff --git a/lib/compiler/implementation/js_backend/emitter.dart b/lib/compiler/implementation/js_backend/emitter.dart

index 1ed02628b329e4ce86fdd80ab42243c8e612b6b0..f33dc3612f83af72812b451e2b52e04d9834f900 100644

--- a/lib/compiler/implementation/js_backend/emitter.dart

+++ b/lib/compiler/implementation/js_backend/emitter.dart

@@ -91,29 +91,51 @@ class CodeEmitterTask extends CompilerTask {

String get lazyInitializerName

=> '${namer.ISOLATE}.\$lazy';

- final String GETTER_SUFFIX = "?";

- final String SETTER_SUFFIX = "!";

- final String GETTER_SETTER_SUFFIX = "=";

+ // Property name suffixes. If the accessors are renaming then the format

+ // is <accessorName>:<fieldName><suffix>. We use the suffix to know whether

+ // to look for the ':' separator in order to avoid doing the indexOf operation

+ // on every single property (they are quite rare). None of these characters

+ // are legal in an identifier and they are related by bit patterns.

+ // setter < 0x3c

+ // both = 0x3d

+ // getter > 0x3e

+ // renaming setter | 0x7c

+ // renaming both } 0x7d

+ // renaming getter ~ 0x7e

+ const SUFFIX_MASK = 0x3f;

+ const FIRST_SUFFIX_CODE = 0x3c;

+ const SETTER_CODE = 0x3c;

+ const GETTER_SETTER_CODE = 0x3d;

+ const GETTER_CODE = 0x3e;

+ const RENAMING_FLAG = 0x40;

+ String needsGetter(String variable) => '($variable & 3) > 0';

floitsch 2012/10/25 12:58:38 needsGetterCode or something to indicate that this

erikcorry 2012/12/06 09:38:07 Done.

+ String needsSetter(String variable) => '($variable & 2) == 0';

+ String isRenaming(String variable) => '($variable & $RENAMING_FLAG) != 0';

String get generateGetterSetterFunction {

return """

function(field, prototype) {

var len = field.length;

- var lastChar = field[len - 1];

- var needsGetter = lastChar == '$GETTER_SUFFIX' || lastChar == '$GETTER_SETTER_SUFFIX';

- var needsSetter = lastChar == '$SETTER_SUFFIX' || lastChar == '$GETTER_SETTER_SUFFIX';

- if (needsGetter || needsSetter) field = field.substring(0, len - 1);

- if (needsGetter) {

- var getterString = "return this." + field + ";";

- """

- /* The supportsProtoCheck below depends on the getter/setter convention.

- When changing here, update the protoCheck too. */

- """

- prototype["get\$" + field] = new Function(getterString);

- }

- if (needsSetter) {

- var setterString = "this." + field + " = v;";

- prototype["set\$" + field] = new Function("v", setterString);

+ var lastCharCode = field.charCodeAt(len - 1);

+ var needsAccessor = (lastCharCode & $SUFFIX_MASK) >= $FIRST_SUFFIX_CODE;

+ if (needsAccessor) {

+ var needsGetter = ${needsGetter('lastCharCode')};

+ var needsSetter = ${needsSetter('lastCharCode')};

+ var renaming = ${isRenaming('lastCharCode')};

+ var accessorName = field = field.substring(0, len - 1);

floitsch 2012/10/25 08:42:40 remove "field =".

erikcorry 2012/10/25 09:09:28 Then it won't work any more!?

floitsch 2012/10/25 12:58:38 never mind. wasn't thinking. Please put in two lin

+ if (renaming) {

+ var divider = field.indexOf(":");

+ accessorName = field.substring(0, divider);

+ field = field.substring(divider + 1);

+ }

+ if (needsGetter) {

+ var getterString = "return this." + field + ";";

+ prototype["get\$" + accessorName] = new Function(getterString);

+ }

+ if (needsSetter) {

+ var setterString = "this." + field + " = v;";

+ prototype["set\$" + accessorName] = new Function("v", setterString);

+ }

}

return field;

}""";

@@ -483,7 +505,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

// on A and a typed selector on B could yield the same stub.

Set<String> generatedStubNames = new Set<String>();

if (compiler.enabledFunctionApply

- && member.name == Namer.CLOSURE_INVOCATION_NAME) {

+ && member.name == namer.CLOSURE_INVOCATION_NAME) {

// If [Function.apply] is called, we pessimistically compile all

// possible stubs for this closure.

// TODO(5074): This functionality only supports the new

@@ -680,6 +702,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

void visitClassFields(ClassElement classElement,

void addField(Element member,

String name,

+ String accessorName,

bool needsGetter,

bool needsSetter,

bool needsCheckedSetter)) {

@@ -715,9 +738,11 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

if ((isInstantiated && !enclosingClass.isNative())

|| needsGetter

|| needsSetter) {

- String fieldName = isShadowed

+ String accessorName = isShadowed

? namer.shadowedFieldName(member)

: namer.getName(member);

+ String fieldName = enclosingClass.isNative() ?

+ member.name.slowToString() : accessorName;

bool needsCheckedSetter = false;

if (needsSetter && compiler.enableTypeAssertions

&& canGenerateCheckedSetter(member)) {

@@ -727,6 +752,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

// Getters and setters with suffixes will be generated dynamically.

addField(member,

fieldName,

+ accessorName,

needsGetter,

needsSetter,

needsCheckedSetter);

@@ -743,13 +769,17 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

includeSuperMembers: isInstantiated && !classElement.isNative());

}

- void generateGetter(Element member, String fieldName, CodeBuffer buffer) {

- String getterName = namer.getterName(member.getLibrary(), member.name);

+ void generateGetter(Element member, String fieldName, String accessorName,

+ CodeBuffer buffer) {

+ String getterName =

+ namer.getterName(member.getLibrary(), new SourceString(accessorName));

buffer.add("$getterName: function() { return this.$fieldName; }");

}

- void generateSetter(Element member, String fieldName, CodeBuffer buffer) {

- String setterName = namer.setterName(member.getLibrary(), member.name);

+ void generateSetter(Element member, String fieldName, String accessorName,

+ CodeBuffer buffer) {

+ String setterName =

+ namer.setterName(member.getLibrary(), new SourceString(accessorName));

buffer.add("$setterName: function(v) { this.$fieldName = v; }");

}

@@ -766,6 +796,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

void generateCheckedSetter(Element member,

String fieldName,

+ String accessorName,

CodeBuffer buffer) {

assert(canGenerateCheckedSetter(member));

DartType type = member.computeType(compiler);

@@ -776,7 +807,8 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

if (helperElement.computeSignature(compiler).parameterCount != 1) {

additionalArgument = ", '${namer.operatorIs(type.element)}'";

}

- String setterName = namer.setterName(member.getLibrary(), member.name);

+ String setterName =

+ namer.setterName(member.getLibrary(), new SourceString(accessorName));

buffer.add("$setterName: function(v) { "

"this.$fieldName = $helperName(v$additionalArgument); }");

}

@@ -790,6 +822,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

bool isFirstField = true;

visitClassFields(classElement, (Element member,

String name,

+ String accessorName,

bool needsGetter,

bool needsSetter,

bool needsCheckedSetter) {

@@ -798,13 +831,19 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

} else {

buffer.add(", ");

}

- buffer.add('"$name');

+ buffer.add('"$accessorName');

+ int flag = 0;

+ if (name != accessorName) {

+ buffer.add(':$name');

+ assert(needsGetter || needsSetter);

+ flag = RENAMING_FLAG;

+ }

if (needsGetter && needsSetter) {

- buffer.add(GETTER_SETTER_SUFFIX);

+ buffer.addCharCode(GETTER_SETTER_CODE + flag);

floitsch 2012/10/25 12:58:38 I would prefer "|" to indicate that this is a bit-

erikcorry 2012/12/06 09:38:07 Done.

} else if (needsGetter) {

- buffer.add(GETTER_SUFFIX);

+ buffer.addCharCode(GETTER_CODE + flag);

} else if (needsSetter) {

- buffer.add(SETTER_SUFFIX);

+ buffer.addCharCode(SETTER_CODE + flag);

}

buffer.add('"');

});

@@ -816,6 +855,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

{bool omitLeadingComma: false}) {

visitClassFields(classElement, (Element member,

String name,

+ String accessorName,

bool needsGetter,

bool needsSetter,

bool needsCheckedSetter) {

@@ -826,7 +866,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

} else {

omitLeadingComma = false;

}

- generateCheckedSetter(member, name, buffer);

+ generateCheckedSetter(member, name, accessorName, buffer);

}

});

}

@@ -1013,7 +1053,7 @@ function(prototype, staticName, fieldName, getterName, lazyValue) {

// create a fake element with the correct name.

// Note: the callElement will not have any enclosingElement.

FunctionElement callElement =

- new ClosureInvocationElement(Namer.CLOSURE_INVOCATION_NAME, element);

+ new ClosureInvocationElement(namer.CLOSURE_INVOCATION_NAME, element);

String staticName = namer.getName(element);

String invocationName = namer.instanceMethodName(callElement);

String fieldAccess = '$isolateProperties.$staticName';

@@ -1090,7 +1130,7 @@ $classesCollector.$mangledName = {'':

// its stubs we simply create a fake element with the correct name.

// Note: the callElement will not have any enclosingElement.

FunctionElement callElement =

- new ClosureInvocationElement(Namer.CLOSURE_INVOCATION_NAME, member);

+ new ClosureInvocationElement(namer.CLOSURE_INVOCATION_NAME, member);

String invocationName = namer.instanceMethodName(callElement);

List<String> arguments = new List<String>(parameterCount);

@@ -1146,7 +1186,7 @@ $classesCollector.$mangledName = {'':

String invocationName =

namer.instanceMethodInvocationName(memberLibrary, member.name,

selector);

- SourceString callName = Namer.CLOSURE_INVOCATION_NAME;

+ SourceString callName = namer.CLOSURE_INVOCATION_NAME;

String closureCallName =

namer.instanceMethodInvocationName(memberLibrary, callName,

selector);