Revert "Split TypedSelector into Selector and TypeMask."

pkg/compiler/lib/src/js_emitter/class_stub_generator.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 ClassStubGenerator {
   final Namer namer;
   final Compiler compiler;
   final JavaScriptBackend backend;
@@ skipping 30 matching lines @@
     return js('function(#, v) { return #.# = v; }',
         [args, receiver, fieldName]);
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [member] must be a declaration element.
    */
   Map<String, jsAst.Expression> generateCallStubsForGetter(
-      Element member, Map<Selector, TypeMaskSet> selectors) {
+      Element member, Set<Selector> selectors) {
     assert(invariant(member, member.isDeclaration));
 
     // If the method is intercepted, the stub gets the
     // receiver explicitely and we need to pass it to the getter call.
     bool isInterceptedMethod = backend.isInterceptedMethod(member);
     bool isInterceptorClass =
         backend.isInterceptorClass(member.enclosingClass);
 
     const String receiverArgumentName = r'$receiver';
 
@@ skipping 11 matching lines @@
         return js('#.#', [receiver, fieldName]);
       }
     }
 
     Map<String, jsAst.Expression> generatedStubs = <String, jsAst.Expression>{};
 
     // Two selectors may match but differ only in type.  To avoid generating
     // identical stubs for each we track untyped selectors which already have
     // stubs.
     Set<Selector> generatedSelectors = new Set<Selector>();
-    for (Selector selector in selectors.keys) {
-      if (generatedSelectors.contains(selector)) continue;
-      if (!selector.appliesUnnamed(member, compiler.world)) continue;
-      for (TypeMask mask in selectors[selector].masks) {
-        if (mask != null &&
-            !mask.canHit(member, selector, compiler.world)) {
-          continue;
-        }
-
+    for (Selector selector in selectors) {
+      if (selector.applies(member, compiler.world)) {
+        selector = selector.asUntyped;
+        if (generatedSelectors.contains(selector)) continue;
         generatedSelectors.add(selector);
 
         String invocationName = namer.invocationName(selector);
         Selector callSelector = new Selector.callClosureFrom(selector);
         String closureCallName = namer.invocationName(callSelector);
 
         List<jsAst.Parameter> parameters = <jsAst.Parameter>[];
         List<jsAst.Expression> arguments = <jsAst.Expression>[];
         if (isInterceptedMethod) {
           parameters.add(new jsAst.Parameter(receiverArgumentName));
@@ skipping 18 matching lines @@
 
   Map<String, Selector> computeSelectorsForNsmHandlers() {
 
     Map<String, Selector> jsNames = <String, Selector>{};
 
     // Do not generate no such method handlers if there is no class.
     if (compiler.codegenWorld.directlyInstantiatedClasses.isEmpty) {
       return jsNames;
     }
 
-    void addNoSuchMethodHandlers(String ignore,
-                                 Map<Selector, TypeMaskSet> selectors) {
+    void addNoSuchMethodHandlers(String ignore, Set<Selector> selectors) {
       TypeMask objectSubclassTypeMask =
           new TypeMask.subclass(compiler.objectClass, compiler.world);
 
-      for (Selector selector in selectors.keys) {
-        TypeMaskSet maskSet = selectors[selector];
-        for (TypeMask mask in maskSet.masks) {
-          if (mask == null) mask = objectSubclassTypeMask;
+      for (Selector selector in selectors) {
+        TypeMask mask = selector.mask;
+        if (mask == null) mask = objectSubclassTypeMask;
 
-          if (mask.needsNoSuchMethodHandling(selector, compiler.world)) {
-            String jsName = namer.invocationMirrorInternalName(selector);
-            jsNames[jsName] = selector;
-            break;
-          }
+        if (!mask.needsNoSuchMethodHandling(selector, compiler.world)) {
+          continue;
         }
+        String jsName = namer.invocationMirrorInternalName(selector);
+        jsNames[jsName] = selector;
       }
     }
 
-    compiler.codegenWorld.forEachInvokedName(addNoSuchMethodHandlers);
-    compiler.codegenWorld.forEachInvokedGetter(addNoSuchMethodHandlers);
-    compiler.codegenWorld.forEachInvokedSetter(addNoSuchMethodHandlers);
+    compiler.codegenWorld.invokedNames.forEach(addNoSuchMethodHandlers);
+    compiler.codegenWorld.invokedGetters.forEach(addNoSuchMethodHandlers);
+    compiler.codegenWorld.invokedSetters.forEach(addNoSuchMethodHandlers);
     return jsNames;
   }
 
   StubMethod generateStubForNoSuchMethod(String name, Selector selector) {
     // Values match JSInvocationMirror in js-helper library.
     int type = selector.invocationMirrorKind;
     List<String> parameterNames =
         new List.generate(selector.argumentCount, (i) => '\$$i');
 
     List<jsAst.Expression> argNames =
@@ skipping 125 matching lines @@
           ? function() {
               if (cache === void 0) cache = #tearOff(
                   this, funcs, reflectionInfo, true, [], name).prototype;
               return cache;
             }
           : tearOffGetter(funcs, reflectionInfo, name, isIntercepted);
     }''',  {'tearOff': tearOffAccessExpression});
 
   return <jsAst.Statement>[tearOffGetter, tearOff];
 }