lib/compiler/implementation/emitter.dart - Issue 10052020: Reduce size by emitting $.foo instead of Isolate.prototype.foo.

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

Issue 10052020: Reduce size by emitting $.foo instead of Isolate.prototype.foo. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: rebase Created 8 years, 8 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: lib/compiler/implementation/emitter.dart

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

index 391cff639c4b348dccabe85b68b47ec3fb568a5c..4303583674f51f9422e8b8e844cf0ec454085ce4 100644

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

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

@@ -38,6 +38,7 @@ function(child, parent) {

final NativeEmitter nativeEmitter;

Set<ClassElement> generatedClasses;

StringBuffer mainBuffer;

+ String isolatePrototype;

CodeEmitterTask(Compiler compiler)

: namer = compiler.namer,

@@ -50,12 +51,6 @@ function(child, parent) {

String get inheritsName() => '${namer.ISOLATE}.\$inherits';

- String get objectClassName() {

- ClassElement objectClass =

- compiler.coreLibrary.find(const SourceString('Object'));

- return namer.isolatePropertyAccess(objectClass);

- }

void addInheritFunctionIfNecessary() {

if (addedInheritFunction) return;

addedInheritFunction = true;

@@ -256,9 +251,10 @@ function(child, parent) {

ClassElement superclass = cls.superclass;

if (superclass !== null) {

addInheritFunctionIfNecessary();

- String className = namer.isolatePropertyAccess(cls);

- String superName = namer.isolatePropertyAccess(superclass);

- buffer.add('${inheritsName}($className, $superName);\n');

+ String className = namer.getName(cls);

+ String superName = namer.getName(superclass);

+ buffer.add('${inheritsName}($isolatePrototype.$className, ');

+ buffer.add('$isolatePrototype.$superName);\n');

}

@@ -282,7 +278,7 @@ function(child, parent) {

buffer = mainBuffer;

}

- String className = namer.isolatePropertyAccess(classElement);

+ String className = '${isolatePrototype}.${namer.getName(classElement)}';

String constructorName = namer.safeName(classElement.name.slowToString());

buffer.add('$className = function $constructorName(');

StringBuffer bodyBuffer = new StringBuffer();

@@ -358,7 +354,8 @@ function(child, parent) {

String functionNamer(Element element)) {

generatedCode.forEach((Element element, String codeBlock) {

if (!element.isInstanceMember()) {

- buffer.add('${functionNamer(element)} = ');

+ buffer.add(isolatePrototype);

+ buffer.add('.${functionNamer(element)} = ');

buffer.add(codeBlock);

buffer.add(';\n\n');

}

@@ -368,10 +365,10 @@ function(child, parent) {

void emitStaticFunctions(StringBuffer buffer) {

emitStaticFunctionsWithNamer(buffer,

compiler.universe.generatedCode,

- namer.isolatePropertyAccess);

+ namer.getName);

emitStaticFunctionsWithNamer(buffer,

compiler.universe.generatedBailoutCode,

- namer.isolateBailoutPropertyAccess);

+ namer.getBailoutName);

}

void emitStaticFunctionGetters(StringBuffer buffer) {

@@ -384,13 +381,18 @@ function(child, parent) {

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

FunctionElement callElement =

new ClosureInvocationElement(Namer.CLOSURE_INVOCATION_NAME, element);

- String staticName = namer.isolatePropertyAccess(element);

+ String staticName = namer.getName(element);

int parameterCount = element.parameterCount(compiler);

String invocationName =

namer.instanceMethodName(element.getLibrary(), callElement.name,

parameterCount);

- buffer.add("$staticName.$invocationName = $staticName;\n");

- addParameterStubs(callElement, (name) => '$staticName.$name', buffer);

+ buffer.add(isolatePrototype);

+ buffer.add(".$staticName.$invocationName = ");

+ buffer.add(isolatePrototype);

+ buffer.add(".$staticName;\n");

+ addParameterStubs(callElement,

+ (name) => '$isolatePrototype.$staticName.$name',

+ buffer);

}

@@ -419,16 +421,17 @@ function(child, parent) {

SourceString name = const SourceString("BoundClosure");

ClassElement closureClassElement =

new ClosureClassElement(compiler, member.getCompilationUnit());

- String isolateAccess = namer.isolatePropertyAccess(closureClassElement);

+ String mangledName = namer.getName(closureClassElement);

ensureGenerated(closureClassElement.superclass, buffer);

// Define the constructor with a name so that Object.toString can

// find the class name of the closure class.

- buffer.add("$isolateAccess = function $name(self) ");

+ buffer.add(isolatePrototype);

+ buffer.add(".$mangledName = function $name(self) ");

buffer.add("{ this.self = self; };\n");

emitInherits(closureClassElement, buffer);

- String prototype = "$isolateAccess.prototype";

+ String prototype = "$isolatePrototype.$mangledName.prototype";

// Now add the methods on the closure class. The instance method does not

// have the correct name. Since [addParameterStubs] use the name to create

@@ -452,7 +455,7 @@ function(child, parent) {

buffer.add(" return this.self.$targetName($joinedArgs);\n");

buffer.add("};\n");

addParameterStubs(callElement,

- (invocationName) => '$prototype.$invocationName',

+ (stubName) => '$prototype.$stubName',

buffer);

// And finally the getter.

@@ -516,7 +519,6 @@ function(child, parent) {

void emitCompileTimeConstants(StringBuffer buffer) {

ConstantHandler handler = compiler.constantHandler;

List<Constant> constants = handler.getConstantsForEmission();

- String prototype = "${namer.ISOLATE}.prototype";

bool addedMakeConstantList = false;

for (Constant constant in constants) {

String name = handler.getNameForConstant(constant);

@@ -526,16 +528,16 @@ function(child, parent) {

if (name === null) continue;

if (!addedMakeConstantList && constant.isList()) {

addedMakeConstantList = true;

- emitMakeConstantList(prototype, buffer);

+ emitMakeConstantList(buffer);

}

- buffer.add('$prototype.$name = ');

+ buffer.add('$isolatePrototype.$name = ');

handler.writeJsCode(buffer, constant);

buffer.add(';\n');

}

- void emitMakeConstantList(String prototype, StringBuffer buffer) {

- buffer.add(prototype);

+ void emitMakeConstantList(StringBuffer buffer) {

+ buffer.add(isolatePrototype);

buffer.add(@'''.makeConstantList = function(list) {

list.immutable$list = true;

list.fixed$length = true;

@@ -549,7 +551,8 @@ function(child, parent) {

List<VariableElement> staticFinalFields =

handler.getStaticFinalFieldsForEmission();

for (VariableElement element in staticFinalFields) {

- buffer.add('${namer.isolatePropertyAccess(element)} = ');

+ buffer.add(isolatePrototype);

+ buffer.add('.${namer.getName(element)} = ');

compiler.withCurrentElement(element, () {

handler.writeJsCodeForVariable(buffer, element);

});

@@ -568,8 +571,7 @@ function(child, parent) {

}

} else if (member.kind == ElementKind.FUNCTION) {

if (compiler.universe.invokedGetters.contains(member.name)) {

- compiler.emitter.emitDynamicFunctionGetter(

- buffer, attachTo, member);

+ compiler.emitter.emitDynamicFunctionGetter(buffer, attachTo, member);

}

@@ -580,8 +582,10 @@ function(child, parent) {

ClassElement objectClass =

compiler.coreLibrary.find(const SourceString('Object'));

- String className = namer.isolatePropertyAccess(objectClass);

- String prototype = '$className.prototype';

+ String className = namer.getName(objectClass);

+ String prototype = '$isolatePrototype.$className.prototype';

+ String runtimeObjectPrototype =

+ '${namer.isolateAccess(objectClass)}.prototype';

String noSuchMethodName =

namer.instanceMethodName(null, Compiler.NO_SUCH_METHOD, 2);

Collection<LibraryElement> libraries =

@@ -601,7 +605,7 @@ function(child, parent) {

buffer.add(' ($args) {\n');

buffer.add(' return this.$noSuchMethodName\n');

buffer.add(" ? this.$noSuchMethodName('$methodName', [$args])\n");

- buffer.add(" : $objectClassName.prototype.$noSuchMethodName.call(");

+ buffer.add(" : $runtimeObjectPrototype.$noSuchMethodName.call(");

buffer.add("this, '$methodName', [$args])\n");

buffer.add('}\n');

}

@@ -718,14 +722,19 @@ if (typeof window != 'undefined' && typeof document != 'undefined' &&

mainBuffer.add('function ${namer.ISOLATE}() {');

emitStaticNonFinalFieldInitializations(mainBuffer);

mainBuffer.add('}\n\n');

+ // Shorten the code by using [namer.CURRENT_ISOLATE] as temporary.

+ isolatePrototype = namer.CURRENT_ISOLATE;

+ mainBuffer.add('var $isolatePrototype = ${namer.ISOLATE}.prototype;\n');

emitClasses(mainBuffer);

emitStaticFunctions(mainBuffer);

emitStaticFunctionGetters(mainBuffer);

emitCompileTimeConstants(mainBuffer);

emitStaticFinalFieldInitializations(mainBuffer);

- nativeEmitter.emitDynamicDispatchMetadata();

+ isolatePrototype = '${namer.ISOLATE}.prototype;\n';

mainBuffer.add(

'var ${namer.CURRENT_ISOLATE} = new ${namer.ISOLATE}();\n');

+ nativeEmitter.emitDynamicDispatchMetadata();

nativeEmitter.assembleCode(mainBuffer);

emitMain(mainBuffer);

compiler.assembledCode = mainBuffer.toString();

« no previous file with comments | « no previous file | lib/compiler/implementation/namer.dart » ('j') | no next file with comments »