Get rid of the name in HInvokeDynamic (just use the selector instead).

lib/compiler/implementation/ssa/builder.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 Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 1047 matching lines @@
 
     HForeignNew newObject = new HForeignNew(classElement, constructorArguments);
     add(newObject);
     // Generate calls to the constructor bodies.
     for (int index = constructors.length - 1; index >= 0; index--) {
       FunctionElement constructor = constructors[index];
       ConstructorBodyElement body = getConstructorBody(constructor);
       if (body === null) continue;
       List bodyCallInputs = <HInstruction>[];
       bodyCallInputs.add(newObject);
+      int arity = body.functionSignature.parameterCount;
       body.functionSignature.forEachParameter((parameter) {
         bodyCallInputs.add(localsHandler.readLocal(parameter));
       });
       // TODO(ahe): The constructor name is statically resolved. See
       // SsaCodeGenerator.visitInvokeDynamicMethod. Is there a cleaner
       // way to do this?
-      SourceString methodName = new SourceString(compiler.namer.getName(body));
-      add(new HInvokeDynamicMethod(null, methodName, bodyCallInputs));
+      SourceString name = new SourceString(compiler.namer.getName(body));
+      // TODO(kasperl): This seems fishy. We shouldn't be inventing all
+      // these selectors. Maybe the resolver can do more of the work
+      // for us here?
+      LibraryElement library = body.getLibrary();
+      Selector selector = new Selector.call(name, library, arity);
+      add(new HInvokeDynamicMethod(selector, bodyCallInputs));
     }
     close(new HReturn(newObject)).addSuccessor(graph.exit);
     return closeFunction();
   }
 
   void openFunction(FunctionElement functionElement,
                     FunctionExpression node) {
     HBasicBlock block = graph.addNewBlock();
     open(graph.entry);
 
@@ skipping 652 matching lines @@
     if (send.receiver == null) {
       return localsHandler.readThis();
     }
     visit(send.receiver);
     return pop();
   }
 
   void generateInstanceGetterWithCompiledReceiver(Send send,
                                                   HInstruction receiver) {
     assert(Elements.isInstanceSend(send, elements));
-    SourceString getterName = send.selector.asIdentifier().source;
-    Selector selector = elements.getSelector(send);
+    // TODO(kasperl): This is a convoluted way of checking if we're
+    // generating code for a compound assignment. If we are, we need
+    // to get the selector from the mapping for the AST selector node.
+    Selector selector = (send.asSendSet() === null)
+        ? elements.getSelector(send)
+        : elements.getSelector(send.selector);
+    assert(selector.isGetter());
+    SourceString getterName = selector.name;
     Element staticInterceptor = null;
     if (methodInterceptionEnabled) {
       staticInterceptor = interceptors.getStaticGetInterceptor(getterName);
     }
     if (staticInterceptor != null) {
       HStatic target = new HStatic(staticInterceptor);
       add(target);
       List<HInstruction> inputs = <HInstruction>[target, receiver];
       push(new HInvokeInterceptor(selector, getterName, inputs, getter: true));
     } else {
-      push(new HInvokeDynamicGetter(selector, null, getterName, receiver));
+      push(new HInvokeDynamicGetter(selector, null, receiver));
     }
   }
 
   void generateGetter(Send send, Element element) {
     if (Elements.isStaticOrTopLevelField(element)) {
       if (element.kind == ElementKind.FIELD && !element.isAssignable()) {
         // A static final. Get its constant value and inline it.
         Constant value = compiler.constantHandler.compileVariable(element);
         stack.add(graph.addConstant(value));
       } else {
@@ skipping 11 matching lines @@
       compiler.enqueuer.codegen.registerGetOfStaticFunction(element);
     } else {
       stack.add(localsHandler.readLocal(element));
     }
   }
 
   void generateInstanceSetterWithCompiledReceiver(Send send,
                                                   HInstruction receiver,
                                                   HInstruction value) {
     assert(Elements.isInstanceSend(send, elements));
-    SourceString dartSetterName = send.selector.asIdentifier().source;
     Selector selector = elements.getSelector(send);
+    assert(selector.isSetter());
+    SourceString setterName = selector.name;
     Element staticInterceptor = null;
     if (methodInterceptionEnabled) {
-      staticInterceptor = interceptors.getStaticSetInterceptor(dartSetterName);
+      staticInterceptor = interceptors.getStaticSetInterceptor(setterName);
     }
     if (staticInterceptor != null) {
       HStatic target = new HStatic(staticInterceptor);
       add(target);
       List<HInstruction> inputs = <HInstruction>[target, receiver, value];
       add(new HInvokeInterceptor(
-          selector, dartSetterName, inputs, setter: true));
+          selector, setterName, inputs, setter: true));
     } else {
-      add(new HInvokeDynamicSetter(selector, null, dartSetterName,
-                                   receiver, value));
+      add(new HInvokeDynamicSetter(selector, null, receiver, value));
     }
     stack.add(value);
   }
 
   void generateSetter(SendSet send, Element element, HInstruction value) {
     if (Elements.isStaticOrTopLevelField(element)) {
       if (element.kind == ElementKind.SETTER) {
         HStatic target = new HStatic(element);
         add(target);
         add(new HInvokeStatic(<HInstruction>[target, value]));
@@ skipping 229 matching lines @@
     if (node.receiver === null) {
       inputs.add(localsHandler.readThis());
     } else {
       visit(node.receiver);
       inputs.add(pop());
     }
 
     addDynamicSendArgumentsToList(node, inputs);
 
     // The first entry in the inputs list is the receiver.
-    pushWithPosition(new HInvokeDynamicMethod(selector, dartMethodName, inputs),
-                     node);
+    pushWithPosition(new HInvokeDynamicMethod(selector, inputs), node);
 
     if (isNotEquals) {
       HNot not = new HNot(popBoolified());
       push(not);
     }
   }
 
   visitClosureSend(Send node) {
     Selector selector = elements.getSelector(node);
     assert(node.receiver === null);
@@ skipping 136 matching lines @@
     visit(closure);
     List<HInstruction> inputs = <HInstruction>[pop()];
     String invocationName = compiler.namer.closureInvocationName(
         new Selector.callClosure(params.requiredParameterCount));
     push(new HForeign(new DartString.literal('#.$invocationName'),
                       const LiteralDartString('var'),
                       inputs));
   }
 
   visitForeignSend(Send node) {
-    Element element = elements[node];
-    if (element.name == const SourceString('JS')) {
+    Selector selector = elements.getSelector(node);
+    SourceString name = selector.name;
+    if (name == const SourceString('JS')) {
       handleForeignJs(node);
-    } else if (element.name == const SourceString('UNINTERCEPTED')) {
+    } else if (name == const SourceString('UNINTERCEPTED')) {
       handleForeignUnintercepted(node);
-    } else if (element.name == const SourceString('JS_HAS_EQUALS')) {
+    } else if (name == const SourceString('JS_HAS_EQUALS')) {
       handleForeignJsHasEquals(node);
-    } else if (element.name == const SourceString('JS_CURRENT_ISOLATE')) {
+    } else if (name == const SourceString('JS_CURRENT_ISOLATE')) {
       handleForeignJsCurrentIsolate(node);
-    } else if (element.name == const SourceString('JS_CALL_IN_ISOLATE')) {
+    } else if (name == const SourceString('JS_CALL_IN_ISOLATE')) {
       handleForeignJsCallInIsolate(node);
-    } else if (element.name == const SourceString('DART_CLOSURE_TO_JS')) {
+    } else if (name == const SourceString('DART_CLOSURE_TO_JS')) {
       handleForeignDartClosureToJs(node);
     } else {
-      throw "Unknown foreign: ${node.selector}";
+      throw "Unknown foreign: ${selector}";
     }
   }
 
   generateSuperNoSuchMethodSend(Send node) {
     ClassElement cls = work.element.getEnclosingClass();
     Element element = cls.lookupSuperMember(Compiler.NO_SUCH_METHOD);
     HStatic target = new HStatic(element);
     add(target);
     HInstruction self = localsHandler.readThis();
     Identifier identifier = node.selector.asIdentifier();
@@ skipping 502 matching lines @@
       SourceString iteratorName = const SourceString("iterator");
       Element interceptor = interceptors.getStaticInterceptor(iteratorName, 0);
       assert(interceptor != null);
       visit(node.expression);
       pushInvokeHelper1(interceptor, pop());
       iterator = pop();
     }
     HInstruction buildCondition() {
       SourceString name = const SourceString('hasNext');
       Selector call = new Selector.call(name, work.element.getLibrary(), 0);
-      push(new HInvokeDynamicMethod(call, name, <HInstruction>[iterator]));
+      push(new HInvokeDynamicMethod(call, <HInstruction>[iterator]));
       return popBoolified();
     }
     void buildBody() {
       SourceString name = const SourceString('next');
       Selector call = new Selector.call(name, work.element.getLibrary(), 0);
-      push(new HInvokeDynamicMethod(call, name, <HInstruction>[iterator]));
+      push(new HInvokeDynamicMethod(call, <HInstruction>[iterator]));
 
       Element variable;
       if (node.declaredIdentifier.asSend() !== null) {
         variable = elements[node.declaredIdentifier];
       } else {
         assert(node.declaredIdentifier.asVariableDefinitions() !== null);
         VariableDefinitions variableDefinitions = node.declaredIdentifier;
         variable = elements[variableDefinitions.definitions.nodes.head];
       }
       localsHandler.updateLocal(variable, pop());
@@ skipping 861 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }