Revert "Split TypedSelector into Selector and TypeMask."

pkg/compiler/lib/src/resolution/registry.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 resolution;
 
 /// [ResolutionRegistry] collects all resolution information. It stores node
 /// related information in a [TreeElements] mapping and registers calls with
 /// [Backend], [World] and [Enqueuer].
 // TODO(johnniwinther): Split this into an interface and implementation class.
@@ skipping 11 matching lines @@
 
   @override
   Iterable<Element> get otherDependencies => mapping.otherDependencies;
 
   @override
   void registerDependency(Element element) {
     mapping.registerDependency(element);
   }
 
   @override
-  void registerDynamicGetter(UniverseSelector selector) {
+  void registerDynamicGetter(Selector selector) {
     world.registerDynamicGetter(selector);
   }
 
   @override
-  void registerDynamicInvocation(UniverseSelector selector) {
+  void registerDynamicInvocation(Selector selector) {
     world.registerDynamicInvocation(selector);
   }
 
   @override
-  void registerDynamicSetter(UniverseSelector selector) {
+  void registerDynamicSetter(Selector selector) {
     world.registerDynamicSetter(selector);
   }
 
   @override
   void registerGetOfStaticFunction(FunctionElement element) {
     world.registerGetOfStaticFunction(element);
   }
 
   @override
   void registerInstantiation(InterfaceType type) {
     // TODO(johnniwinther): Remove the need for passing `this`.
     world.registerInstantiatedType(type, this);
   }
 
   @override
   void registerStaticInvocation(Element element) {
     registerDependency(element);
     world.registerStaticUse(element);
   }
 }
 
 class ResolutionWorldImpact implements WorldImpact {
   final Registry registry;
-  Setlet<UniverseSelector> _dynamicInvocations;
-  Setlet<UniverseSelector> _dynamicGetters;
-  Setlet<UniverseSelector> _dynamicSetters;
+  Setlet<Selector> _dynamicInvocations;
+  Setlet<Selector> _dynamicGetters;
+  Setlet<Selector> _dynamicSetters;
   Setlet<InterfaceType> _instantiatedTypes;
   Setlet<Element> _staticUses;
   Setlet<DartType> _checkedTypes;
   Setlet<MethodElement> _closurizedFunctions;
 
   ResolutionWorldImpact(Compiler compiler, TreeElementMapping mapping)
       : this.registry = new EagerRegistry(compiler, mapping);
 
-  void registerDynamicGetter(UniverseSelector selector) {
+  void registerDynamicGetter(Selector selector) {
     if (_dynamicGetters == null) {
-      _dynamicGetters = new Setlet<UniverseSelector>();
+      _dynamicGetters = new Setlet<Selector>();
     }
     _dynamicGetters.add(selector);
   }
 
   @override
-  Iterable<UniverseSelector> get dynamicGetters {
-    return _dynamicGetters != null
-        ? _dynamicGetters : const <UniverseSelector>[];
+  Iterable<Selector> get dynamicGetters {
+    return _dynamicGetters != null ? _dynamicGetters : const <Selector>[];
   }
 
-  void registerDynamicInvocation(UniverseSelector selector) {
+  void registerDynamicInvocation(Selector selector) {
     if (_dynamicInvocations == null) {
-      _dynamicInvocations = new Setlet<UniverseSelector>();
+      _dynamicInvocations = new Setlet<Selector>();
     }
     _dynamicInvocations.add(selector);
   }
 
   @override
-  Iterable<UniverseSelector> get dynamicInvocations {
+  Iterable<Selector> get dynamicInvocations {
     return _dynamicInvocations != null
-        ? _dynamicInvocations : const <UniverseSelector>[];
+        ? _dynamicInvocations : const <Selector>[];
   }
 
-  void registerDynamicSetter(UniverseSelector selector) {
+  void registerDynamicSetter(Selector selector) {
     if (_dynamicSetters == null) {
-      _dynamicSetters = new Setlet<UniverseSelector>();
+      _dynamicSetters = new Setlet<Selector>();
     }
     _dynamicSetters.add(selector);
   }
 
   @override
-  Iterable<UniverseSelector> get dynamicSetters {
-    return _dynamicSetters != null
-        ? _dynamicSetters : const <UniverseSelector>[];
+  Iterable<Selector> get dynamicSetters {
+    return _dynamicSetters != null ? _dynamicSetters : const <Selector>[];
   }
 
   void registerInstantiatedType(InterfaceType type) {
     // TODO(johnniwinther): Enable this when registration doesn't require a
     // [Registry].
     throw new UnsupportedError(
         'Lazy registration of instantiated not supported.');
     if (_instantiatedTypes == null) {
       _instantiatedTypes = new Setlet<InterfaceType>();
     }
@@ skipping 282 matching lines @@
   }
 
   void registerClosure(LocalFunctionElement element) {
     world.registerClosure(element, this);
   }
 
   void registerSuperUse(Node node) {
     mapping.addSuperUse(node);
   }
 
-  void registerDynamicInvocation(UniverseSelector selector) {
+  void registerDynamicInvocation(Selector selector) {
     worldImpact.registerDynamicInvocation(selector);
   }
 
   void registerSuperNoSuchMethod() {
     backend.resolutionCallbacks.onSuperNoSuchMethod(this);
   }
 
   void registerClassUsingVariableExpression(ClassElement element) {
     backend.registerClassUsingVariableExpression(element);
   }
@@ skipping 28 matching lines @@
   // TODO(johnniwinther): Remove the [ResolverVisitor] dependency. Its only
   // needed to lookup types in the current scope.
   void registerJsBuiltinCall(Node node, ResolverVisitor visitor) {
     world.registerJsBuiltinCall(node, visitor);
   }
 
   void registerGetOfStaticFunction(FunctionElement element) {
     worldImpact.registerClosurizedFunction(element);
   }
 
-  void registerDynamicGetter(UniverseSelector selector) {
+  void registerDynamicGetter(Selector selector) {
     worldImpact.registerDynamicGetter(selector);
   }
 
-  void registerDynamicSetter(UniverseSelector selector) {
+  void registerDynamicSetter(Selector selector) {
     worldImpact.registerDynamicSetter(selector);
   }
 
   void registerConstSymbol(String name) {
     backend.registerConstSymbol(name, this);
   }
 
   void registerSymbolConstructor() {
     backend.resolutionCallbacks.onSymbolConstructor(this);
   }
@@ skipping 77 matching lines @@
   }
 
   void registerAsyncMarker(FunctionElement element) {
     backend.registerAsyncMarker(element, world, this);
   }
 
   void registerAsyncForIn(AsyncForIn node) {
     backend.resolutionCallbacks.onAsyncForIn(node, this);
   }
 }