It's alive!

pkg/compiler/lib/src/js_emitter/parameter_stub_generator.dart

 // Copyright (c) 2015, 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.
 
 library dart2js.js_emitter.parameter_stub_generator;
 
 import '../closure.dart' show ClosureClassElement;
 import '../common.dart';
 import '../common_elements.dart';
 import '../constants/values.dart';
 import '../elements/elements.dart'
     show
         ClassElement,
         FunctionElement,
         FunctionSignature,
         MethodElement,
         ParameterElement;
+import '../elements/entities.dart';
+import '../elements/names.dart';
 import '../js/js.dart' as jsAst;
 import '../js/js.dart' show js;
 import '../js_backend/constant_handler_javascript.dart'
     show JavaScriptConstantCompiler;
 import '../js_backend/namer.dart' show Namer;
 import '../js_backend/native_data.dart';
 import '../js_backend/interceptor_data.dart';
 import '../universe/call_structure.dart' show CallStructure;
 import '../universe/selector.dart' show Selector;
 import '../universe/world_builder.dart'
@@ skipping 188 matching lines @@
   // (3) foo$3$d(a, b, d) => foo$4$c$d(a, b, null, d);
   // (4) No stub generated, call is direct.
   // (5) No stub generated, call is direct.
   //
   // We need to pay attention if this stub is for a function that has been
   // invoked from a subclass. Then we cannot just redirect, since that
   // would invoke the methods of the subclass. We have to compile to:
   // (1) foo$2(a, b) => MyClass.foo$4$c$d.call(this, a, b, null, null)
   // (2) foo$3$c(a, b, c) => MyClass.foo$4$c$d(this, a, b, c, null);
   // (3) foo$3$d(a, b, d) => MyClass.foo$4$c$d(this, a, b, null, d);
-  List<ParameterStubMethod> generateParameterStubs(MethodElement member,
+  List<ParameterStubMethod> generateParameterStubs(FunctionEntity member,
       {bool canTearOff: true}) {
-    if (member.enclosingElement.isClosure) {
-      ClosureClassElement cls = member.enclosingElement;
+    if (member.enclosingClass != null && member.enclosingClass.isClosure) {

[Siggi Cherem (dart-lang), 2017/05/30 22:10:20]

I just noticed that we added `isClosure` to classEntity - do we want to move
away from that in the long run?)

[Johnni Winther, 2017/05/31 08:19:31]

If anything, it belongs in the J-model.

+      ClosureClassElement cls = member.enclosingClass;
       if (cls.supertype.element == _commonElements.boundClosureClass) {
         throw new SpannableAssertionFailure(
             cls.methodElement, 'Bound closure1.');
       }
       if (cls.methodElement.isInstanceMember) {
         throw new SpannableAssertionFailure(
             cls.methodElement, 'Bound closure2.');
       }
     }
 
@@ skipping 36 matching lines @@
     // For example, for the call-selector `call(x, y)` the renamed selector
     // for member `foo` would be `foo(x, y)`.
     Set<Selector> renamedCallSelectors =
         callSelectors.isEmpty ? emptySelectorSet : new Set<Selector>();
 
     Set<Selector> untypedSelectors = new Set<Selector>();
 
     // Start with the callSelectors since they imply the generation of the
     // non-call version.
     for (Selector selector in callSelectors.keys) {
-      Selector renamedSelector =
-          new Selector.call(member.memberName, selector.callStructure);
+      Selector renamedSelector = new Selector.call(
+          new Name(member.name, member.library), selector.callStructure);
       renamedCallSelectors.add(renamedSelector);
 
       if (!renamedSelector.appliesUnnamed(member)) {
         continue;
       }
 
       if (untypedSelectors.add(renamedSelector)) {
         ParameterStubMethod stub =
             generateParameterStub(member, renamedSelector, selector);
         if (stub != null) {
@@ skipping 17 matching lines @@
             generateParameterStub(member, selector, null);
         if (stub != null) {
           stubs.add(stub);
         }
       }
     }
 
     return stubs;
   }
 }