Add name and library to selectors.

lib/compiler/implementation/enqueue.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.
 
 class EnqueueTask extends CompilerTask {
   final Enqueuer codegen;
   final Enqueuer resolution;
 
   String get name() => 'Enqueue';
 
@@ skipping 137 matching lines @@
       // Make sure that the closure understands a call with the given
       // selector. For a method-invocation of the form o.foo(a: 499), we
       // need to make sure that closures can handle the optional argument if
       // there exists a field or getter 'foo'.
       var names = universe.instantiatedClassInstanceFields;
       // TODO(ahe): Might be enough to use invokedGetters.
       for (SourceString name in names) {
         Set<Selector> invokedSelectors = universe.invokedNames[name];
         if (invokedSelectors != null) {
           for (Selector selector in invokedSelectors) {
+            Selector call = new Selector.call(
+                compiler.namer.CLOSURE_INVOCATION_NAME,
+                selector.library,  // TODO(kasperl): Use "default" library?
+                selector.argumentCount,
+                selector.namedArguments);
             registerDynamicInvocation(compiler.namer.CLOSURE_INVOCATION_NAME,
-                                      selector);
+                                      call);
           }
         }
       }
     });
   }
 
   void processInstantiatedClassMember(Element member) {
     if (universe.generatedCode.containsKey(member)) return;
     if (resolvedElements[member] !== null) return;
 
@@ skipping 50 matching lines @@
         cls.ensureResolved(compiler);
         cls.localMembers.forEach(processInstantiatedClassMember);
         cls = cls.superclass;
       }
     });
   }
 
   void registerNewSelector(SourceString name,
                            Selector selector,
                            Map<SourceString, Set<Selector>> selectorsMap) {
+    if (name != selector.name) {
+      String message = "$name != ${selector.name} (${selector.kind})";
+      compiler.internalError("Wrong selector name: $message.");

[ahe, 2012/08/15 07:37:59]

Style-wise, I think I'd prefer:

compiler.internalError("Wrong selector name: "
                       "$name != ${selector.name} (${selector.kind})");

+    }
     Set<Selector> selectors =
         selectorsMap.putIfAbsent(name, () => new Set<Selector>());
     if (!selectors.contains(selector)) {
       selectors.add(selector);
       handleUnseenSelector(name, selector);
     }
   }
 
   void registerInvocation(SourceString methodName, Selector selector) {
     task.measure(() {
@@ skipping 54 matching lines @@
   }
 
   void registerDynamicGetter(SourceString methodName, Selector selector) {
     registerInvokedGetter(methodName, selector);
   }
 
   void registerDynamicSetter(SourceString methodName, Selector selector) {
     registerInvokedSetter(methodName, selector);
   }
 
-  void registerFieldGetter(SourceString getterName, Type type) {
+  void registerFieldGetter(SourceString getterName,
+                           LibraryElement library,
+                           Type type) {
     task.measure(() {
+      Selector getter = new Selector.getter(getterName, library);
       registerNewSelector(getterName,
-                          new TypedSelector(type, Selector.GETTER),
+                          new TypedSelector(type, getter),
                           universe.fieldGetters);
     });
   }
 
-  void registerFieldSetter(SourceString setterName, Type type) {
+  void registerFieldSetter(SourceString setterName,
+                           LibraryElement library,
+                           Type type) {
     task.measure(() {
+      Selector setter = new Selector.setter(setterName, library);
       registerNewSelector(setterName,
-                          new TypedSelector(type, Selector.SETTER),
+                          new TypedSelector(type, setter),
                           universe.fieldSetters);
     });
   }
 
   // TODO(ngeoffray): This should get a type.
   void registerIsCheck(Element element) {
     universe.isChecks.add(element);
   }
 
   void forEach(f(WorkItem work)) {
     while (!queue.isEmpty()) {
       do {
         f(queue.removeLast());
       } while (!queue.isEmpty());
       // TODO(ahe): we shouldn't register the field closure invocations here.
       registerFieldClosureInvocations();
     }
   }
 }