Revert "NoSuchMethod on different super accesses/invocations handled."

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 3115 matching lines @@
       handleForeignJsCallInIsolate(node);
     } else if (name == const SourceString('DART_CLOSURE_TO_JS')) {
       handleForeignDartClosureToJs(node);
     } else {
       throw "Unknown foreign: ${selector}";
     }
   }
 
   generateSuperNoSuchMethodSend(Send node) {
     Selector selector = elements.getSelector(node);
-    String name = selector.invocationMirrorMemberName;
+    SourceString name = selector.name;
+
     ClassElement cls = work.element.getEnclosingClass();
-    if (cls is ClosureClassElement) {
-      ClosureClassElement closureClass = cls;
-      cls = closureClass.methodElement.getEnclosingClass();
-    }
     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:].
-      compiler.enqueuer.codegen.registerDynamicInvocation(selector.name,
-                                                          selector);
+      compiler.enqueuer.codegen.registerDynamicInvocation(name, selector);
     }
     HStatic target = new HStatic(element);
     add(target);
     HInstruction self = localsHandler.readThis();
     Constant nameConstant = constantSystem.createString(
-        new DartString.literal(name), node);
+        new DartString.literal(name.slowToString()), node);
 
-    String internalName = backend.namer.invocationMirrorInternalName(selector);
+    String internalName = backend.namer.instanceMethodInvocationName(
+        currentLibrary, name, selector);
     Constant internalNameConstant =
         constantSystem.createString(new DartString.literal(internalName), node);
 
     Element createInvocationMirror =
         compiler.findHelper(Compiler.CREATE_INVOCATION_MIRROR);
 
     var arguments = new List<HInstruction>();
     if (node.argumentsNode != null) {
       addGenericSendArgumentsToList(node.arguments, arguments);
     }
@@ skipping 39 matching lines @@
     Selector selector = elements.getSelector(node);
     Element element = elements[node];
     if (element == null) return generateSuperNoSuchMethodSend(node);
     // TODO(5346): Try to avoid the need for calling [declaration] before
     // creating an [HStatic].
     HInstruction target = new HStatic(element.declaration);
     HInstruction context = localsHandler.readThis();
     add(target);
     var inputs = <HInstruction>[target, context];
     if (node.isPropertyAccess) {
-      push(new HInvokeSuper(inputs, isPropertyAccess: true));
+      push(new HInvokeSuper(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) {
-        generateSuperNoSuchMethodSend(node);
+        generateWrongArgumentCountError(node, element, node.arguments);
       } else {
         push(new HInvokeSuper(inputs));
       }
     } else {
       target = new HInvokeSuper(inputs);
       add(target);
       inputs = <HInstruction>[target];
       addDynamicSendArgumentsToList(node, inputs);
       push(new HInvokeClosure(selector, inputs));
     }
@@ skipping 406 matching lines @@
   visitSendSet(SendSet node) {
     Element element = elements[node];
     if (!Elements.isUnresolved(element) && element.impliesType()) {
       Identifier selector = node.selector;
       generateThrowNoSuchMethod(node, selector.source.slowToString(),
                                 argumentNodes: node.arguments);
       return;
     }
     Operator op = node.assignmentOperator;
     if (node.isSuperCall) {
-      if (Elements.isUnresolved(element) || !Elements.isAssignable(element)) {
-        return generateSuperNoSuchMethodSend(node);
-      }
+      if (element == null) return generateSuperNoSuchMethodSend(node);
       HInstruction target = new HStatic(element);
       HInstruction context = localsHandler.readThis();
       add(target);
       var inputs = <HInstruction>[target, context];
       addDynamicSendArgumentsToList(node, inputs);
       if (!identical(node.assignmentOperator.source.stringValue, '=')) {
         compiler.unimplemented('complex super assignment',
                                node: node.assignmentOperator);
       }
-      push(new HInvokeSuper(inputs, isSendSet: true));
+      push(new HInvokeSuper(inputs, isSetter: true));
     } else if (node.isIndex) {
       if (!methodInterceptionEnabled) {
         assert(identical(op.source.stringValue, '='));
         visitDynamicSend(node);
       } else {
         HStatic target = new HStatic(
             interceptors.getIndexAssignmentInterceptor());
         add(target);
         visit(node.receiver);
         HInstruction receiver = pop();
@@ skipping 1406 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;
   }
 }