Change inference element invariants

pkg/compiler/lib/src/inferrer/closure_tracer.dart

 // Copyright (c) 2013, 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 compiler.src.inferrer.closure_tracer;
 
 import '../common/names.dart' show Names;
 import '../elements/elements.dart';
+import '../elements/entities.dart';
 import '../js_backend/backend.dart' show JavaScriptBackend;
 import '../types/types.dart' show TypeMask;
 import '../universe/selector.dart' show Selector;
 import 'debug.dart' as debug;
 import 'inferrer_engine.dart';
 import 'node_tracer.dart';
 import 'type_graph_nodes.dart';
 
 class ClosureTracerVisitor extends TracerVisitor {
-  final Iterable<MethodElement> tracedElements;
+  final Iterable<FunctionEntity> tracedElements;
   final List<CallSiteTypeInformation> _callsToAnalyze =
       new List<CallSiteTypeInformation>();
 
   ClosureTracerVisitor(this.tracedElements, ApplyableTypeInformation tracedType,
       InferrerEngine inferrer)
       : super(tracedType, inferrer);
 
   ApplyableTypeInformation get tracedType => super.tracedType;
 
   void run() {
     analyze();
     if (!continueAnalyzing) return;
     _callsToAnalyze.forEach(_analyzeCall);
-    for (MethodElement e in tracedElements) {
-      e.functionSignature.forEachParameter((Element parameter) {
+    for (MethodElement element in tracedElements) {
+      MethodElement implementation = element.implementation;
+      implementation.functionSignature.forEachParameter((Element parameter) {
         ElementTypeInformation info =
             inferrer.types.getInferredTypeOfParameter(parameter);
         info.disableInferenceForClosures = false;
       });
     }
   }
 
   void _tagAsFunctionApplyTarget([String reason]) {
     tracedType.mightBePassedToFunctionApply = true;
     if (debug.VERBOSE) {
       print("Closure $tracedType might be passed to apply: $reason");
     }
   }
 
   void _registerCallForLaterAnalysis(CallSiteTypeInformation info) {
     _callsToAnalyze.add(info);
   }
 
   void _analyzeCall(CallSiteTypeInformation info) {
     Selector selector = info.selector;
     TypeMask mask = info.mask;
-    tracedElements.forEach((MethodElement functionElement) {
+    tracedElements.forEach((FunctionEntity functionElement) {
       if (!selector.callStructure
           .signatureApplies(functionElement.parameterStructure)) {
         return;
       }
       inferrer.updateParameterAssignments(
           info, functionElement, info.arguments, selector, mask,
           remove: false, addToQueue: false);
     });
   }
 
   @override
   visitClosureCallSiteTypeInformation(ClosureCallSiteTypeInformation info) {
     super.visitClosureCallSiteTypeInformation(info);
     if (info.closure == currentUser) {
       _registerCallForLaterAnalysis(info);
     } else {
       bailout('Passed to a closure');
     }
   }
 
   @override
   visitStaticCallSiteTypeInformation(StaticCallSiteTypeInformation info) {
     super.visitStaticCallSiteTypeInformation(info);
-    Element called = info.calledElement;
-    if (compiler.backend
-        .isForeign(inferrer.closedWorld.commonElements, called)) {
+    MemberEntity called = info.calledElement;
+    if (inferrer.closedWorld.commonElements.isForeign(called)) {
       String name = called.name;
       if (name == JavaScriptBackend.JS || name == 'DART_CLOSURE_TO_JS') {
         bailout('Used in JS ${info.call}');
       }
     }
     if (called.isGetter &&
         info.selector != null &&
         info.selector.isCall &&
         inferrer.types.getInferredTypeOfMember(called) == currentUser) {
       // This node can be a closure call as well. For example, `foo()`
       // where `foo` is a getter.
       _registerCallForLaterAnalysis(info);
     }
-    if (called is MemberElement &&
-        _checkIfFunctionApply(called) &&
+    if (_checkIfFunctionApply(called) &&
         info.arguments != null &&
         info.arguments.contains(currentUser)) {
       _tagAsFunctionApplyTarget("static call");
     }
   }
 
-  bool _checkIfCurrentUser(MemberElement element) =>
+  bool _checkIfCurrentUser(MemberEntity element) =>
       inferrer.types.getInferredTypeOfMember(element) == currentUser;
 
-  bool _checkIfFunctionApply(MemberElement element) {
+  bool _checkIfFunctionApply(MemberEntity element) {
     return inferrer.closedWorld.commonElements.isFunctionApplyMethod(element);
   }
 
   @override
   visitDynamicCallSiteTypeInformation(DynamicCallSiteTypeInformation info) {
     super.visitDynamicCallSiteTypeInformation(info);
     if (info.selector.isCall) {
       if (info.arguments.contains(currentUser)) {
         if (!info.targets.every((element) => element.isFunction)) {
           bailout('Passed to a closure');
@@ skipping 20 matching lines @@
   @override
   visitStaticCallSiteTypeInformation(StaticCallSiteTypeInformation info) {
     super.visitStaticCallSiteTypeInformation(info);
     if (info.calledElement == tracedElements.first &&
         info.selector != null &&
         info.selector.isGetter) {
       addNewEscapeInformation(info);
     }
   }
 }