dart2js: Merge intercepted names map.

pkg/compiler/lib/src/js_emitter/old_emitter/reflection_data_parser.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;
 
 // TODO(ahe): Share these with js_helper.dart.
 const FUNCTION_INDEX = 0;
 const NAME_INDEX = 1;
 const CALL_NAME_INDEX = 2;
@@ skipping 232 matching lines @@
       f = tearOff(funcs, array, isStatic, name, isIntercepted);
       descriptor[name].\$getter = f;
       f.\$getterStub = true;
       // Used to create an isolate using spawnFunction.
       if (isStatic) #globalFunctions[name] = f;
       originalDescriptor[getterStubName] = descriptor[getterStubName] = f;
       funcs.push(f);
       if (getterStubName) functions.push(getterStubName);
       f.\$stubName = getterStubName;
       f.\$callName = null;
-      if (isIntercepted) #interceptedNames[getterStubName] = true;
+      // Update the interceptedNames map (which only exists if `invokeOn` was
+      // enabled).
+      if (#enabledInvokeOn)

[ahe, 2015/01/07 15:31:32]

Curly braces?

[floitsch, 2015/01/07 15:48:12]

They would stay, when the if(#hole) is resolved.

+        if (isIntercepted) #interceptedNames[getterStubName] = 1;
     }
 
     if (#usesMangledNames) {
       var isReflectable = array.length > unmangledNameIndex;
       if (isReflectable) {
         for (var i = 0; i < funcs.length; i++) {
           funcs[i].$reflectableField = 1;
           funcs[i].$reflectionInfoField = array;
         }
         var mangledNames = isStatic ? #mangledGlobalNames : #mangledNames;
         var unmangledName = ${readString("array", "unmangledNameIndex")};
         // The function is either a getter, a setter, or a method.
         // If it is a method, it might also have a tear-off closure.
         // The unmangledName is the same as the getter-name.
         var reflectionName = unmangledName;
         if (getterStubName) mangledNames[getterStubName] = reflectionName;
         if (isSetter) {
           reflectionName += "=";
         } else if (!isGetter) {
           reflectionName += ":" + requiredParameterCount +
             ":" + optionalParameterCount;
         }
         mangledNames[name] = reflectionName;
         funcs[0].$reflectionNameField = reflectionName;
         funcs[0].$metadataIndexField = unmangledNameIndex + 1;
         if (optionalParameterCount) descriptor[unmangledName + "*"] = funcs[0];
       }
     }
   }
-''', {'globalFunctions' : globalFunctionsAccess,
+''', {'globalFunctions': globalFunctionsAccess,
+      'enabledInvokeOn': compiler.enabledInvokeOn,
       'interceptedNames': interceptedNamesAccess,
       'usesMangledNames':
           compiler.mirrorsLibrary != null || compiler.enabledFunctionApply,
       'mangledGlobalNames': mangledGlobalNamesAccess,
       'mangledNames': mangledNamesAccess});
 
   List<jsAst.Statement> tearOffCode = buildTearOffCode(backend);
 
+  jsAst.ObjectInitializer interceptedNamesSet =
+      oldEmitter.interceptorEmitter.generateInterceptedNamesSet();
+
   jsAst.Statement init = js.statement('''{
   var functionCounter = 0;
   if (!#libraries) #libraries = [];
   if (!#mangledNames) #mangledNames = map();
   if (!#mangledGlobalNames) #mangledGlobalNames = map();
   if (!#statics) #statics = map();
   if (!#typeInformation) #typeInformation = map(); 
   if (!#globalFunctions) #globalFunctions = map();
-  if (!#interceptedNames) #interceptedNames = map();
+  if (#enabledInvokeOn)
+    if (!#interceptedNames) #interceptedNames = #interceptedNamesSet;
   var libraries = #libraries;
   var mangledNames = #mangledNames;
   var mangledGlobalNames = #mangledGlobalNames;
   var hasOwnProperty = Object.prototype.hasOwnProperty;
   var length = reflectionData.length;
   var processedClasses = Object.create(null);
   processedClasses.collected = Object.create(null);
   processedClasses.pending = Object.create(null);
   if (#notInCspMode) {
     processedClasses.constructorsList = [];
@@ skipping 31 matching lines @@
     libraries.push([name, uri, classes, functions, metadata, fields, isRoot,
                     globalObject]);
   }
     if (#needsClassSupport) finishClasses(processedClasses);
 }''', {'libraries': librariesAccess,
        'mangledNames': mangledNamesAccess,
        'mangledGlobalNames': mangledGlobalNamesAccess,
        'statics': staticsAccess,
        'typeInformation': typeInformationAccess,
        'globalFunctions': globalFunctionsAccess,
+       'enabledInvokeOn': compiler.enabledInvokeOn,
        'interceptedNames': interceptedNamesAccess,
+       'interceptedNamesSet': interceptedNamesSet,
        'notInCspMode': !compiler.useContentSecurityPolicy,
        'needsClassSupport': oldEmitter.needsClassSupport});
 
   jsAst.Expression allClassesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.ALL_CLASSES);
 
   String specProperty = '"${namer.nativeSpecProperty}"';  // "%"
 
   // Class descriptions are collected in a JS object.
   // 'finishClasses' takes all collected descriptions and sets up
@@ skipping 211 matching lines @@
 (function() {
   var result = $array[$index];
   if ($check) {
     throw new Error(
         name + ": expected value of type \'$type\' at index " + ($index) +
         " but got " + (typeof result));
   }
   return result;
 })()''';
 }