Chromium Code Reviews| 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 b221f8889a045c6766dbdb998b9e8aeed9c0c450..cf60491808d318f1b1973a967141f79558542158 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 |
| @@ -62,7 +62,6 @@ class ContainerBuilder extends CodeEmitterHelper { |
| count++; |
| parametersBuffer[0] = new jsAst.Parameter(receiverArgumentName); |
| argumentsBuffer[0] = js('#', receiverArgumentName); |
| - emitter.interceptorEmitter.interceptorInvocationNames.add(invocationName); |
| } |
| int optionalParameterStart = positionalArgumentCount + extraArgumentCount; |
| @@ -259,6 +258,9 @@ class ContainerBuilder extends CodeEmitterHelper { |
| addParameterStubs( |
| member, |
| (Selector selector, jsAst.Fun function) { |
| + String invocationName = namer.invocationName(selector); |
| + emitter.interceptorEmitter. |
|
floitsch
2015/01/29 17:27:10
You seem to be missing the test that the member is
zarah
2015/01/29 18:24:18
The check is done in recordMangledNameOfMemberMeth
floitsch
2015/01/29 18:38:09
Acknowledged.
|
| + recordMangledNameOfMemberMethod(member, invocationName); |
| compiler.dumpInfoTask.registerElementAst(member, |
| builder.addProperty(namer.invocationName(selector), |
|
floitsch
2015/01/29 17:27:10
reuse invocationName local.
zarah
2015/01/29 18:24:18
Done.
|
| function)); |
| @@ -336,11 +338,15 @@ class ContainerBuilder extends CodeEmitterHelper { |
| if (needsStubs || canTearOff) { |
| addParameterStubs(member, (Selector selector, jsAst.Fun function) { |
| + |
| + String invocationName = namer.invocationName(selector); |
| + emitter.interceptorEmitter. |
|
floitsch
2015/01/29 17:27:10
ditto: missing the check that it is an interceptor
zarah
2015/01/29 18:24:18
Same as above.
|
| + recordMangledNameOfMemberMethod(member, invocationName); |
| expressions.add(function); |
| if (member.isInstanceMember) { |
| Set invokedSelectors = |
| compiler.codegenWorld.invokedNames[member.name]; |
| - expressions.add(js.string(namer.invocationName(selector))); |
| + expressions.add(js.string(invocationName)); |
| } else { |
| expressions.add(js('null')); |
| // TOOD(ahe): Since we know when reading static data versus instance |