Re-apply r27739: Fix invocation_mirror_test.dart.

sdk/lib/_internal/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.
 
 part of ssa;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 3259 matching lines @@
     } else {
       throw "Unknown foreign: ${selector}";
     }
   }
 
   generateSuperNoSuchMethodSend(Send node,
                                 Selector selector,
                                 List<HInstruction> arguments) {
     SourceString name = selector.name;
 
-    ClassElement cls = currentElement.getEnclosingClass();
+    ClassElement cls = currentNonClosureClass;
     Element element = cls.lookupSuperMember(Compiler.NO_SUCH_METHOD);
     if (element.enclosingElement.declaration != compiler.objectClass) {
       // Register the call as dynamic if [noSuchMethod] on the super
       // class is _not_ the default implementation from [Object], in
       // case the [noSuchMethod] implementation calls
       // [JSInvocationMirror._invokeOn].
       compiler.enqueuer.codegen.registerSelectorUse(selector);
     }
+    String publicName = name.slowToString();
+    if (selector.isSetter()) publicName += '=';
+
     Constant nameConstant = constantSystem.createString(
-        new DartString.literal(name.slowToString()), node);
+        new DartString.literal(publicName), node);
 
     String internalName = backend.namer.invocationName(selector);
     Constant internalNameConstant =
         constantSystem.createString(new DartString.literal(internalName), node);
 
     Element createInvocationMirror = backend.getCreateInvocationMirror();
     var argumentsInstruction = buildLiteralList(arguments);
     add(argumentsInstruction);
 
     var argumentNames = new List<HInstruction>();
@@ skipping 37 matching lines @@
       List<HInstruction> arguments = <HInstruction>[];
       if (!node.isPropertyAccess) {
         addGenericSendArgumentsToList(node.arguments, arguments);
       }
       return generateSuperNoSuchMethodSend(node, selector, arguments);
     }
     List<HInstruction> inputs = <HInstruction>[];
     if (node.isPropertyAccess) {
       push(buildInvokeSuper(selector, element, inputs));
     } else if (element.isFunction() || element.isGenerativeConstructor()) {
-      // TODO(5347): Try to avoid the need for calling [implementation] before
-      // calling [addStaticSendArgumentsToList].
-      FunctionElement function = element.implementation;
-      bool succeeded = addStaticSendArgumentsToList(selector, node.arguments,
-                                                    function, inputs);
-      if (!succeeded) {
+      if (selector.applies(element, compiler)) {
+        // TODO(5347): Try to avoid the need for calling [implementation] before
+        // calling [addStaticSendArgumentsToList].
+        FunctionElement function = element.implementation;
+        bool succeeded = addStaticSendArgumentsToList(selector, node.arguments,
+                                                      function, inputs);
+        assert(succeeded);
+        push(buildInvokeSuper(selector, element, inputs));
+      } else if (element.isGenerativeConstructor()) {
         generateWrongArgumentCountError(node, element, node.arguments);
       } else {
-        push(buildInvokeSuper(selector, element, inputs));
+        addGenericSendArgumentsToList(node.arguments, inputs);
+        generateSuperNoSuchMethodSend(node, selector, inputs);
       }
     } else {
       HInstruction target = buildInvokeSuper(selector, element, inputs);
       add(target);
       inputs = <HInstruction>[target];
       addDynamicSendArgumentsToList(node, inputs);
       Selector closureSelector = new Selector.callClosureFrom(selector);
       push(new HInvokeClosure(closureSelector, inputs));
     }
   }
@@ skipping 555 matching lines @@
       inputs.add(invokeInterceptor(receiver));
     }
     inputs.add(receiver);
     inputs.addAll(arguments);
     HInstruction instruction = new HInvokeSuper(
         element,
         currentNonClosureClass,
         selector,
         inputs,
         isSetter: selector.isSetter() || selector.isIndexSet());
-    instruction.instructionType =
-        new HType.inferredReturnTypeForElement(element, compiler);
+    if (element.isField() && selector.isGetter()) {
+      instruction.instructionType =
+          new HType.inferredTypeForElement(element, compiler);
+    } else {
+      instruction.instructionType =
+          new HType.inferredReturnTypeForElement(element, compiler);
+    }
     instruction.sideEffects = compiler.world.getSideEffectsOfElement(element);
     return instruction;
   }
 
   void handleComplexOperatorSend(SendSet node,
                                  HInstruction receiver,
                                  Link<Node> arguments) {
     HInstruction rhs;
     if (node.isPrefix || node.isPostfix) {
       rhs = graph.addConstantInt(1, compiler);
@@ skipping 53 matching lines @@
         handleComplexOperatorSend(node, getterInstruction, arguments);
         setterInputs.add(pop());
 
         if (node.isPostfix) {
           result = getterInstruction;
         } else {
           result = setterInputs.last;
         }
       }
       Selector setterSelector = elements.getSelector(node);
-      if (Elements.isUnresolved(element)) {
+      if (Elements.isUnresolved(element)
+          || !setterSelector.applies(element, compiler)) {
         generateSuperNoSuchMethodSend(
             node, setterSelector, setterInputs);
         pop();
       } else {
         add(buildInvokeSuper(setterSelector, element, setterInputs));
       }
       stack.add(result);
     } else if (node.isIndex) {
       if (const SourceString("=") == op.source) {
         visitDynamicSend(node);
@@ skipping 1523 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;
   }
 }