Revert "Split TypedSelector into Selector and TypeMask."

pkg/compiler/lib/src/inferrer/inferrer_visitor.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.
 
 library inferrer_visitor;
 
 import '../constants/constant_system.dart';
 import '../constants/expressions.dart';
 import '../dart2jslib.dart' hide Selector, TypedSelector;
 import '../dart_types.dart';
@@ skipping 29 matching lines @@
   T get stringType;
   T get typeType;
 
   T stringLiteralType(DartString value);
 
   T nonNullSubtype(ClassElement type);
   T nonNullSubclass(ClassElement type);
   T nonNullExact(ClassElement type);
   T nonNullEmpty();
   bool isNull(T type);
-  TypeMask newTypedSelector(T receiver, TypeMask mask);
+  Selector newTypedSelector(T receiver, Selector selector);
 
   T allocateList(T type,
                  Node node,
                  Element enclosing,
                  [T elementType, int length]);
 
   T allocateMap(T type, Node node, Element element, [List<T> keyType,
                                                      List<T> valueType]);
 
   T allocateClosure(Node node, Element element);
@@ skipping 42 matching lines @@
 
   /**
    * Adds [newType] as an input of [phiType].
    */
   T addPhiInput(Local variable, T phiType, T newType);
 
   /**
    * Returns `true` if `selector` should be updated to reflect the new
    * `receiverType`.
    */
-  bool selectorNeedsUpdate(T receiverType, TypeMask mask);
+  bool selectorNeedsUpdate(T receiverType, Selector selector);
 
   /**
    * Returns a new receiver type for this [selector] applied to
    * [receiverType].
    *
    * The option [isConditional] is true when [selector] was seen in a
    * conditional send (e.g.  `a?.selector`), in which case the returned type may
    * be null.
    */
-  T refineReceiver(Selector selector,
-                   TypeMask mask,
-                   T receiverType,
-                   bool isConditional);
+  T refineReceiver(Selector selector, T receiverType, bool isConditional);
 
   /**
    * Returns the internal inferrer representation for [mask].
    */
   T getConcreteTypeFor(TypeMask mask);
 }
 
 /**
  * A variable scope holds types for variables. It has a link to a
  * parent scope, but never changes the types in that parent. Instead,
@@ skipping 1306 matching lines @@
     return type;
   }
 
   T visitCascade(Cascade node) {
     // Ignore the result of the cascade send and return the type of the cascade
     // receiver.
     visit(node.expression);
     return cascadeReceiverStack.removeLast();
   }
 }