| Index: pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| index e22631a6084d05d6b34ff61f626bd8bd11b1dab7..e30ecdcdbe73ec55ea85d94c5b1c40d49dc60af3 100644
|
| --- a/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| +++ b/pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart
|
| @@ -238,7 +238,7 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| String name = method.name;
|
| final FunctionSignature parameters = member.functionSignature;
|
| jsAst.Expression code = method.code;
|
| - final bool needsStubs = method.needsStubs;
|
| + final bool needsStubs = !method.parameterStubs.isEmpty;
|
| final bool canTearOff = method.needsTearOff;
|
| final String tearOffName = method.tearOffName;
|
| final bool canBeReflected = method.canBeReflected;
|
| @@ -254,16 +254,12 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| if (!needStructuredInfo) {
|
| compiler.dumpInfoTask.registerElementAst(member,
|
| builder.addProperty(name, code));
|
| - if (needsStubs) {
|
| - addParameterStubs(
|
| - member,
|
| - (Selector selector, jsAst.Fun function) {
|
| - String invocationName = namer.invocationName(selector);
|
| - emitter.interceptorEmitter
|
| - .recordMangledNameOfMemberMethod(member, invocationName);
|
| - compiler.dumpInfoTask.registerElementAst(member,
|
| - builder.addProperty(invocationName, function));
|
| - });
|
| +
|
| + for (ParameterStubMethod method in method.parameterStubs) {
|
| + jsAst.Property property = builder.addProperty(method.name, method.code);
|
| + compiler.dumpInfoTask.registerElementAst(member, property);
|
| + emitter.interceptorEmitter
|
| + .recordMangledNameOfMemberMethod(member, method.name);
|
| }
|
| return;
|
| }
|
| @@ -336,31 +332,30 @@ class ContainerBuilder extends CodeEmitterHelper {
|
| List tearOffInfo = [new jsAst.LiteralString(callSelectorString)];
|
|
|
| if (needsStubs || canTearOff) {
|
| - addParameterStubs(member, (Selector selector, jsAst.Fun function) {
|
|
|
| - String invocationName = namer.invocationName(selector);
|
| + for (ParameterStubMethod method in method.parameterStubs) {
|
| + String invocationName = method.name;
|
| emitter.interceptorEmitter.
|
| - recordMangledNameOfMemberMethod(member, invocationName);
|
| - expressions.add(function);
|
| + recordMangledNameOfMemberMethod(member, invocationName);
|
| + expressions.add(method.code);
|
| if (member.isInstanceMember) {
|
| - Set invokedSelectors =
|
| - compiler.codegenWorld.invokedNames[member.name];
|
| - expressions.add(js.string(invocationName));
|
| + expressions.add(js.string(invocationName));
|
| } else {
|
| expressions.add(js('null'));
|
| // TOOD(ahe): Since we know when reading static data versus instance
|
| // data, we can eliminate this element.
|
| }
|
| +
|
| Set<Selector> callSelectors = compiler.codegenWorld.invokedNames[
|
| - namer.closureInvocationSelectorName];
|
| - Selector callSelector = selector.toCallSelector();
|
| + namer.closureInvocationSelectorName];
|
| + Selector callSelector = method.selector.toCallSelector();
|
| String callSelectorString = 'null';
|
| if (canTearOff && callSelectors != null &&
|
| callSelectors.contains(callSelector)) {
|
| callSelectorString = '"${namer.invocationName(callSelector)}"';
|
| }
|
| tearOffInfo.add(new jsAst.LiteralString(callSelectorString));
|
| - }, canTearOff);
|
| + }
|
| }
|
|
|
| jsAst.Expression memberTypeExpression;
|
|
|