dart2js: Merge intercepted names map.

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

 // Copyright (c) 2014, 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 OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 750 matching lines @@
       getElementDescriptor(element).properties.addAll(builder.properties);
     }
   }
 
   void emitStaticNonFinalFieldInitializations(CodeBuffer buffer,
                                               OutputUnit outputUnit) {
     JavaScriptConstantCompiler handler = backend.constants;
     Iterable<VariableElement> staticNonFinalFields =
         handler.getStaticNonFinalFieldsForEmission();
     for (Element element in Elements.sortedByPosition(staticNonFinalFields)) {
-      // [:interceptedNames:] is handled in [emitInterceptedNames].
-      if (element == backend.interceptedNames) continue;
       // `mapTypeToInterceptor` is handled in [emitMapTypeToInterceptor].
       if (element == backend.mapTypeToInterceptor) continue;
       compiler.withCurrentElement(element, () {
         jsAst.Expression initialValue;
         if (outputUnit !=
             compiler.deferredLoadTask.outputUnitForElement(element)) {
           if (outputUnit == compiler.deferredLoadTask.mainOutputUnit) {
             // In the main output-unit we output a stub initializer for deferred
             // variables, such that `isolateProperties` stays a fast object.
             initialValue = jsAst.number(0);
@@ skipping 624 matching lines @@
     var descriptor = Object.create(null);
     this.addStubs(descriptor, array, name, isStatic, originalDescriptor, []);
     return descriptor;
   };
 }""",
           { 'helper': js('this.#', [namer.incrementalHelperName]),
             'schemaChange': buildSchemaChangeFunction(),
             'addMethod': buildIncrementalAddMethod() }), compiler));
     }
     if (isProgramSplit) {
-      /// We collect all the global state of the, so it can be passed to the
+      /// We collect all the global state, so it can be passed to the
       /// initializer of deferred files.
       mainBuffer.write('var ${globalsHolder}$_=${_}Object.create(null)$N');
     }
     mainBuffer.write('function dart()$_{$n'
         '${_}${_}this.x$_=${_}0$N'
         '${_}${_}delete this.x$N'
         '}$n');
     for (String globalObject in Namer.reservedGlobalObjectNames) {
       // The global objects start as so-called "slow objects". For V8, this
       // means that it won't try to make map transitions as we add properties
@@ skipping 70 matching lines @@
     // which may need getInterceptor (and one-shot interceptor) methods, so
     // we have to make sure that [emitGetInterceptorMethods] and
     // [emitOneShotInterceptors] have been called.
     emitCompileTimeConstants(mainBuffer, mainOutputUnit);
 
     emitDeferredBoilerPlate(mainBuffer, deferredLoadHashes);
 
     // Static field initializations require the classes and compile-time
     // constants to be set up.
     emitStaticNonFinalFieldInitializations(mainBuffer, mainOutputUnit);
-    interceptorEmitter.emitInterceptedNames(mainBuffer);
     interceptorEmitter.emitMapTypeToInterceptor(mainBuffer);
     emitLazilyInitializedStaticFields(mainBuffer);
 
     mainBuffer.writeln();
     mainBuffer.write(nativeBuffer);
 
     metadataEmitter.emitMetadata(mainBuffer);
 
     isolateProperties = isolatePropertiesName;
     // The following code should not use the short-hand for the
@@ skipping 514 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }