dart2js: Merge intercepted names map.

pkg/compiler/lib/src/js_emitter/old_emitter/interceptor_emitter.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;
 
 class InterceptorEmitter extends CodeEmitterHelper {
   final Set<String> interceptorInvocationNames = new Set<String>();
 
   void recordMangledNameOfMemberMethod(FunctionElement member, String name) {
@@ skipping 44 matching lines @@
           js('${globalObject}.# = #', [name, function]);
 
       buffer.write(jsAst.prettyPrint(assignment, compiler));
       buffer.write(N);
     }
   }
 
   /**
    * If [JSInvocationMirror._invokeOn] has been compiled, emit all the
    * possible selector names that are intercepted into the
-   * [interceptedNames] top-level variable. The implementation of
+   * [interceptedNames] embedded global. The implementation of
    * [_invokeOn] will use it to determine whether it should call the
    * method with an extra parameter.
    */
-  void emitInterceptedNames(CodeBuffer buffer) {
-    // TODO(ahe): We should not generate the list of intercepted names at
-    // compile time, it can be generated automatically at runtime given
-    // subclasses of Interceptor (which can easily be identified).
-    if (!compiler.enabledInvokeOn) return;
-
-    // TODO(ahe): We should roll this into
-    // [emitStaticNonFinalFieldInitializations].
-    String name = backend.namer.getNameOfGlobalField(backend.interceptedNames);
+  jsAst.ObjectInitializer generateInterceptedNamesSet() {
+    // We could also generate the list of intercepted names at
+    // runtime, by running through the subclasses of Interceptor
+    // (which can easily be identified).
+    if (!compiler.enabledInvokeOn) return null;
 
     int index = 0;
-    var invocationNames = interceptorInvocationNames.toList()..sort();
-    List<jsAst.Expression> elements = invocationNames.map(js.string).toList();
-    jsAst.ArrayInitializer array =
-        new jsAst.ArrayInitializer(elements);
-
-    jsAst.Expression assignment =
-        js('${emitter.isolateProperties}.# = #', [name, array]);
-
-    buffer.write(jsAst.prettyPrint(assignment, compiler));
-    buffer.write(N);
+    List<String> invocationNames = interceptorInvocationNames.toList()..sort();
+    List<jsAst.Property> properties =
+        new List<jsAst.Property>(invocationNames.length);
+    for (int i = 0; i < invocationNames.length; i++) {
+      String name = invocationNames[i];
+      properties[i] = new jsAst.Property(js.string(name), js.number(1));
+    }
+    return new jsAst.ObjectInitializer(properties, isOneLiner: true);
   }
 
   /**
    * Emit initializer for [mapTypeToInterceptor] data structure used by
    * [findInterceptorForType].  See declaration of [mapTypeToInterceptor] in
    * `interceptors.dart`.
    */
   void emitMapTypeToInterceptor(CodeBuffer buffer) {
     // TODO(sra): Perhaps inject a constant instead?
     CustomElementsAnalysis analysis = backend.customElementsAnalysis;
@@ skipping 46 matching lines @@
     jsAst.ArrayInitializer array = new jsAst.ArrayInitializer(elements);
     String name =
         backend.namer.getNameOfGlobalField(backend.mapTypeToInterceptor);
     jsAst.Expression assignment =
         js('${emitter.isolateProperties}.# = #', [name, array]);
 
     buffer.write(jsAst.prettyPrint(assignment, compiler));
     buffer.write(N);
   }
 }