dart2js: move recording of interceptorInvocationNames from addParameterStub.

pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart2js.js_emitter;
 
 /// This class should morph into something that makes it easy to build
 /// JavaScript representations of libraries, class-sides, and instance-sides.
 /// Initially, it is just a placeholder for code that is moved from
 /// [CodeEmitterTask].
@@ skipping 44 matching lines @@
     List<jsAst.Expression> argumentsBuffer =
         new List<jsAst.Expression>(
             parameters.parameterCount + extraArgumentCount);
     String invocationName = namer.invocationName(selector);
 
     int count = 0;
     if (isInterceptedMethod) {
       count++;
       parametersBuffer[0] = new jsAst.Parameter(receiverArgumentName);
       argumentsBuffer[0] = js('#', receiverArgumentName);
-      emitter.interceptorEmitter.interceptorInvocationNames.add(invocationName);
     }
 
     int optionalParameterStart = positionalArgumentCount + extraArgumentCount;
     // Includes extra receiver argument when using interceptor convention
     int indexOfLastOptionalArgumentInParameters = optionalParameterStart - 1;
 
     int parameterIndex = 0;
     parameters.orderedForEachParameter((ParameterElement element) {
       String jsName = backend.namer.safeName(element.name);
       assert(jsName != receiverArgumentName);
@@ skipping 176 matching lines @@
 
     emitter.interceptorEmitter.recordMangledNameOfMemberMethod(member, name);
 
     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.

[floitsch, 2015/01/29 17:27:10]

You seem to be missing the test that the member is indeed intercepted.

[zarah, 2015/01/29 18:24:18]

The check is done in recordMangledNameOfMemberMethod.

[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));
             });
       }
       return;
     }
     emitter.needsStructuredMemberInfo = true;
 
     // This element is needed for reflection or needs additional stubs or has a
     // super alias. So we need to retain additional information.
 
@@ skipping 55 matching lines @@
     if (member.isAccessor) requiredParameterCount++;
 
     int optionalParameterCount = parameters.optionalParameterCount << 1;
     if (parameters.optionalParametersAreNamed) optionalParameterCount++;
 
     // TODO(sra): Don't use LiteralString for non-strings.
     List tearOffInfo = [new jsAst.LiteralString(callSelectorString)];
 
     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
           // data, we can eliminate this element.
         }
         Set<Selector> callSelectors = compiler.codegenWorld.invokedNames[
             namer.closureInvocationSelectorName];
         Selector callSelector = selector.toCallSelector();
         String callSelectorString = 'null';
         if (canTearOff && callSelectors != null &&
@@ skipping 75 matching lines @@
     jsAst.ArrayInitializer arrayInit =
       new jsAst.ArrayInitializer(expressions.toList());
     compiler.dumpInfoTask.registerElementAst(member,
         builder.addProperty(name, arrayInit));
   }
 
   void addMemberField(Field field, ClassBuilder builder) {
     // For now, do nothing.
   }
 }