Implement .getCallType

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

 // Copyright (c) 2014, 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.program_builder;
 
 import 'dart:io';
 import 'dart:convert' show JSON;
 
 import '../../closure.dart' show ClosureConversionTask, ClosureFieldElement;
 import '../../common.dart';
 import '../../common/names.dart' show Names, Selectors;
 import '../../constants/values.dart'
     show ConstantValue, InterceptorConstantValue;
 import '../../common_elements.dart' show CommonElements, ElementEnvironment;
 import '../../deferred_load.dart' show DeferredLoadTask, OutputUnit;
 import '../../elements/elements.dart'
     show
         ClassElement,
         FieldElement,
         FunctionSignature,
-        GetterElement,
         LibraryElement,
         MemberElement,
         MethodElement,
         ParameterElement;
 import '../../elements/entities.dart';
 import '../../elements/resolution_types.dart'
-    show ResolutionDartType, ResolutionFunctionType, ResolutionTypedefType;
-import '../../elements/types.dart' show DartType, DartTypes;
+    show ResolutionDartType, ResolutionFunctionType;
+import '../../elements/types.dart';
 import '../../js/js.dart' as js;
 import '../../js_backend/backend.dart' show SuperMemberData;
 import '../../js_backend/backend_usage.dart';
 import '../../js_backend/constant_handler_javascript.dart'
     show JavaScriptConstantCompiler;
 import '../../js_backend/custom_elements_analysis.dart';
 import '../../js_backend/namer.dart' show Namer, StringBackedName;
 import '../../js_backend/native_data.dart';
 import '../../js_backend/interceptor_data.dart';
 import '../../js_backend/mirrors_data.dart';
@@ skipping 476 matching lines @@
     // tearing off JavaScript methods as we cannot distinguish between calling
     // a regular getter that returns a JavaScript function and tearing off
     // a method in the case where there exist multiple JavaScript classes
     // that conflict on whether the member is a getter or a method.
     var interceptorClass = _classes[_commonElements.jsJavaScriptObjectClass];
     var stubNames = new Set<String>();
     librariesMap
         .forEach((LibraryEntity library, List<ClassEntity> classElements, _) {
       for (ClassEntity cls in classElements) {
         if (_nativeData.isJsInteropClass(cls)) {
           // TODO(redemption): Handle class entities.

[Siggi Cherem (dart-lang), 2017/08/11 16:14:59]

delete todo?

[Johnni Winther, 2017/08/15 14:17:37]

Done.

-          ClassElement e = cls;
-          e.declaration.forEachMember((_, _member) {
-            MemberElement member = _member;
+          _elementEnvironment.forEachClassMember(cls, (_, MemberEntity member) {
             var jsName = _nativeData.computeUnescapedJSInteropName(member.name);
             if (!member.isInstanceMember) return;
             if (member.isGetter || member.isField || member.isFunction) {
               var selectors =
                   _worldBuilder.getterInvocationsByName(member.name);
               if (selectors != null && !selectors.isEmpty) {
                 for (var selector in selectors.keys) {
                   var stubName = _namer.invocationName(selector);
                   if (stubNames.add(stubName.key)) {
                     interceptorClass.callStubs.add(_buildStubMethod(stubName,
@@ skipping 13 matching lines @@
                   interceptorClass.callStubs.add(_buildStubMethod(stubName,
                       js.js('function(obj, v) { return obj.# = v }', [jsName]),
                       element: member));
                 }
               }
             }
 
             // Generating stubs for direct calls and stubs for call-through
             // of getters that happen to be functions.
             bool isFunctionLike = false;
-            ResolutionFunctionType functionType = null;
+            FunctionType functionType = null;
 
             if (member.isFunction) {
               MethodElement fn = member;
               functionType = fn.type;
             } else if (member.isGetter) {
               if (_options.trustTypeAnnotations) {
-                GetterElement getter = member;
-                ResolutionDartType returnType = getter.type.returnType;
+                DartType returnType =
+                    _elementEnvironment.getFunctionType(member).returnType;
                 if (returnType.isFunctionType) {
                   functionType = returnType;
                 } else if (returnType.treatAsDynamic ||
                     _types.isSubtype(
                         returnType,
                         // ignore: UNNECESSARY_CAST
                         _commonElements.functionType as DartType)) {
                   if (returnType.isTypedef) {
-                    ResolutionTypedefType typedef = returnType;
-                    // TODO(jacobr): can we just use typdef.unaliased instead?
-                    functionType = typedef.element.functionSignature.type;
+                    TypedefType typedef = returnType;
+                    functionType = typedef.unaliased;
                   } else {
                     // Other misc function type such as commonElements.Function.
                     // Allow any number of arguments.
                     isFunctionLike = true;
                   }
                 }
               } else {
                 isFunctionLike = true;
               }
             } // TODO(jacobr): handle field elements.
@@ skipping 596 matching lines @@
       Constant constant = new Constant(name, holder, constantValue);
       _constants[constantValue] = constant;
     }
   }
 
   Holder _registerStaticStateHolder() {
     return _registry.registerHolder(_namer.staticStateHolder,
         isStaticStateHolder: true);
   }
 }