Revert "Split TypedSelector into Selector and TypeMask."

pkg/compiler/lib/src/ssa/invoke_dynamic_specializers.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 ssa;
 
 /**
  * [InvokeDynamicSpecializer] and its subclasses are helpers to
  * optimize intercepted dynamic calls. It knows what input types
  * would be beneficial for performance, and how to change a invoke
  * dynamic to a builtin instruction (e.g. HIndex, HBitNot).
  */
 class InvokeDynamicSpecializer {
   const InvokeDynamicSpecializer();
 
   TypeMask computeTypeFromInputTypes(HInvokeDynamic instruction,
                                      Compiler compiler) {
-    return TypeMaskFactory.inferredTypeForSelector(
-        instruction.selector, instruction.mask, compiler);
+    Selector selector = instruction.selector;
+    return TypeMaskFactory.inferredTypeForSelector(selector, compiler);
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     return null;
   }
 
   Operation operation(ConstantSystem constantSystem) => null;
 
   static InvokeDynamicSpecializer lookupSpecializer(Selector selector) {
@@ skipping 76 matching lines @@
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     if (!instruction.inputs[1].isIndexablePrimitive(compiler)) return null;
     if (!instruction.inputs[2].isInteger(compiler)
         && compiler.enableTypeAssertions) {
       // We want the right checked mode error.
       return null;
     }
     TypeMask receiverType =
         instruction.getDartReceiver(compiler).instructionType;
-    TypeMask type = TypeMaskFactory.inferredTypeForSelector(
-        instruction.selector, receiverType, compiler);
+    Selector refined = new TypedSelector(receiverType, instruction.selector,
+        compiler.world);
+    TypeMask type = TypeMaskFactory.inferredTypeForSelector(refined, compiler);
     return new HIndex(
         instruction.inputs[1], instruction.inputs[2],
         instruction.selector, type);
   }
 }
 
 class BitNotSpecializer extends InvokeDynamicSpecializer {
   const BitNotSpecializer();
 
   UnaryOperation operation(ConstantSystem constantSystem) {
@@ skipping 103 matching lines @@
     return left.isUInt31(compiler) && right.isUInt31(compiler);
   }
 
   HInstruction newBuiltinVariant(HInvokeDynamic instruction, Compiler compiler);
 
   Selector renameToOptimizedSelector(String name,
                                      Selector selector,
                                      Compiler compiler) {
     if (selector.name == name) return selector;
     JavaScriptBackend backend = compiler.backend;
-    return new Selector(
+    Selector newSelector = new Selector(
         SelectorKind.CALL, new Name(name, backend.interceptorsLibrary),
         new CallStructure(selector.argumentCount));
+    return selector.mask == null
+        ? newSelector
+        : new TypedSelector(selector.mask, newSelector, compiler.world);
   }
 }
 
 class AddSpecializer extends BinaryArithmeticSpecializer {
   const AddSpecializer();
 
   TypeMask computeTypeFromInputTypes(HInvokeDynamic instruction,
                                      Compiler compiler) {
     if (inputsAreUInt31(instruction, compiler)) {
       JavaScriptBackend backend = compiler.backend;
@@ skipping 404 matching lines @@
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     HInstruction left = instruction.inputs[1];
     HInstruction right = instruction.inputs[2];
     TypeMask instructionType = left.instructionType;
     if (right.isConstantNull() || left.isPrimitiveOrNull(compiler)) {
       return newBuiltinVariant(instruction, compiler);
     }
     World world = compiler.world;
+    Selector selector =
+        new TypedSelector(instructionType, instruction.selector, world);
     JavaScriptBackend backend = compiler.backend;
-    Iterable<Element> matches = world.allFunctions.filter(
-        instruction.selector, instructionType);
+    Iterable<Element> matches = world.allFunctions.filter(selector);
     // This test relies the on `Object.==` and `Interceptor.==` always being
     // implemented because if the selector matches by subtype, it still will be
     // a regular object or an interceptor.
     if (matches.every(backend.isDefaultEqualityImplementation)) {
       return newBuiltinVariant(instruction, compiler);
     }
     return null;
   }
 
   BinaryOperation operation(ConstantSystem constantSystem) {
@@ skipping 80 matching lines @@
     return constantSystem.codeUnitAt;
   }
 
   HInstruction tryConvertToBuiltin(HInvokeDynamic instruction,
                                    Compiler compiler) {
     // TODO(sra): Implement a builtin HCodeUnitAt instruction and the same index
     // bounds checking optimizations as for HIndex.
     return null;
   }
 }