dart2js: Change how super tear-offs are registered.

pkg/compiler/lib/src/ssa/codegen.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;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
   final SourceInformationStrategy sourceInformationFactory;
@@ skipping 1745 matching lines @@
         push(new js.Assignment(access, pop())
             .withSourceInformation(node.sourceInformation));
       } else {
         registry.registerStaticUse(new StaticUse.superGet(superElement));
         push(access);
       }
     } else {
       Selector selector = node.selector;
       if (!backend.maybeRegisterAliasedSuperMember(superElement, selector)) {
         js.Name methodName;
-        if (selector.isGetter) {
-          // If the selector we need to register a typed getter to the
-          // [world]. The emitter needs to know if it needs to emit a
-          // bound closure for a method.
-
-          // If [superMethod] is mixed in, [superClass] might not be live.
-          // We use the superclass of the access instead.
-          TypeMask receiverType =
-              new TypeMask.nonNullExact(node.caller.superclass, compiler.world);
-          // TODO(floitsch): we know the target. We shouldn't register a
-          // dynamic getter.
-          registry.registerDynamicUse(
-              new DynamicUse(selector, receiverType));
-          if (superElement.isFunction) {
-            registry.registerStaticUse(
-                new StaticUse.superTearOff(superElement));
-          }
+        if (selector.isGetter && !superElement.isGetter) {
+          // If this is a tear-off, register the fact that a tear-off closure
+          // will be created, and that this tear-off must bypass ordinary
+          // dispatch to ensure the super method is invoked.
+          FunctionElement helper = backend.helpers.closureFromTearOff;
+          registry.registerStaticUse(new StaticUse.staticInvoke(helper,
+                new CallStructure.unnamed(helper.parameters.length)));
+          registry.registerStaticUse(new StaticUse.superTearOff(node.element));
           methodName = backend.namer.invocationName(selector);
         } else {
-          assert(invariant(node, compiler.hasIncrementalSupport));
           methodName = backend.namer.instanceMethodName(superElement);
         }
         registry.registerStaticUse(
             new StaticUse.superInvoke(
                 superElement,
                 new CallStructure.unnamed(node.inputs.length)));
         push(js.js('#.#.call(#)',
                    [backend.emitter.prototypeAccess(superClass,
                                                     hasBeenInstantiated: true),
                     methodName, visitArguments(node.inputs, start: 0)])
@@ skipping 1123 matching lines @@
         new StaticUse.staticInvoke(helper,
             new CallStructure.unnamed(argumentCount)));
     return backend.emitter.staticFunctionAccess(helper);
   }
 
   @override
   void visitRef(HRef node) {
     visit(node.value);
   }
 }