Revert "Split TypedSelector into Selector and TypeMask."

pkg/compiler/lib/src/compiler.dart

 // Copyright (c) 2012, 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;
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
@@ skipping 75 matching lines @@
   }
 
   void registerInstantiatedType(InterfaceType type) {
     world.registerInstantiatedType(type, this);
   }
 
   void registerStaticUse(Element element) {
     world.registerStaticUse(element);
   }
 
-  void registerDynamicInvocation(UniverseSelector selector) {
+  void registerDynamicInvocation(Selector selector) {
     world.registerDynamicInvocation(selector);
     compiler.dumpInfoTask.elementUsesSelector(currentElement, selector);
   }
 
-  void registerDynamicSetter(UniverseSelector selector) {
+  void registerDynamicSetter(Selector selector) {
     world.registerDynamicSetter(selector);
     compiler.dumpInfoTask.elementUsesSelector(currentElement, selector);
   }
 
-  void registerDynamicGetter(UniverseSelector selector) {
+  void registerDynamicGetter(Selector selector) {
     world.registerDynamicGetter(selector);
     compiler.dumpInfoTask.elementUsesSelector(currentElement, selector);
   }
 
   void registerGetterForSuperMethod(Element element) {
     world.registerGetterForSuperMethod(element);
   }
 
   void registerFieldGetter(Element element) {
     world.registerFieldGetter(element);
@@ skipping 20 matching lines @@
 
   void registerInstantiatedClosure(LocalFunctionElement element) {
     backend.registerInstantiatedClosure(element, this);
   }
 
   void registerGetOfStaticFunction(FunctionElement element) {
     world.registerGetOfStaticFunction(element);
   }
 
   void registerSelectorUse(Selector selector) {
-    world.registerSelectorUse(new UniverseSelector(selector, null));
+    world.registerSelectorUse(selector);
   }
 
   void registerConstSymbol(String name) {
     backend.registerConstSymbol(name, this);
   }
 
   void registerSpecializedGetInterceptor(Set<ClassElement> classes) {
     backend.registerSpecializedGetInterceptor(classes);
   }
 
@@ skipping 74 matching lines @@
 /// Interface for registration of element dependencies.
 abstract class Registry {
   // TODO(johnniwinther): Remove this getter when [Registry] creates a
   // dependency node.
   Iterable<Element> get otherDependencies;
 
   void registerDependency(Element element);
 
   bool get isForResolution;
 
-  void registerDynamicInvocation(UniverseSelector selector);
+  void registerDynamicInvocation(Selector selector);
 
-  void registerDynamicGetter(UniverseSelector selector);
+  void registerDynamicGetter(Selector selector);
 
-  void registerDynamicSetter(UniverseSelector selector);
+  void registerDynamicSetter(Selector selector);
 
   void registerStaticInvocation(Element element);
 
   void registerInstantiation(InterfaceType type);
 
   void registerGetOfStaticFunction(FunctionElement element);
 }
 
 abstract class Backend {
   final Compiler compiler;
@@ skipping 1230 matching lines @@
    */
   Uri resolvePatchUri(String dartLibraryPath);
 
   Future runCompiler(Uri uri) {
     // TODO(ahe): This prevents memory leaks when invoking the compiler
     // multiple times. Implement a better mechanism where we can store
     // such caches in the compiler and get access to them through a
     // suitably maintained static reference to the current compiler.
     StringToken.canonicalizedSubstrings.clear();
     Selector.canonicalizedValues.clear();
+    world.canonicalizedValues.clear();
 
     assert(uri != null || analyzeOnly || hasIncrementalSupport);
     return new Future.sync(() {
       if (librariesToAnalyzeWhenRun != null) {
         return Future.forEach(librariesToAnalyzeWhenRun, (libraryUri) {
           log('Analyzing $libraryUri ($buildId)');
           return libraryLoader.loadLibrary(libraryUri);
         });
       }
     }).then((_) {
@@ skipping 1000 matching lines @@
   InterfaceType streamType([DartType elementType]) {
     InterfaceType type = streamClass.computeType(compiler);
     if (elementType == null) {
       return streamClass.rawType;
     }
     return type.createInstantiation([elementType]);
   }
 }
 
 typedef void InternalErrorFunction(Spannable location, String message);