Reapply (plus add some more) Entity-ify some portions of LocalsHandler and Closure.

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

 // Copyright (c) 2017, 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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/names.dart';
 import '../compiler.dart';
 import '../constants/expressions.dart';
@@ skipping 742 matching lines @@
    * are fixed.
    */
   bool hasAlreadyComputedTypeOfParameterDefault(Element parameter) {
     TypeInformation seen = defaultTypeOfParameter[parameter];
     return (seen != null && seen is! PlaceholderTypeInformation);
   }
 
   /**
    * Returns the type of [element].
    */
-  TypeInformation typeOfElement(Element element) {
+  TypeInformation typeOfElement(Entity element) {
     if (element is FunctionElement) return types.functionType;
     return types.getInferredTypeOf(element);
   }
 
   /**
    * Returns the return type of [element].
    */
-  TypeInformation returnTypeOfElement(Element element) {
+  TypeInformation returnTypeOfElement(Entity element) {
     if (element is! FunctionElement) return types.dynamicType;
     return types.getInferredTypeOf(element);
   }
 
   /**
    * Records that [node] sets final field [element] to be of type [type].
    *
    * [nodeHolder] is the element holder of [node].
    */
   void recordTypeOfFinalField(
-      Spannable node, Element analyzed, Element element, TypeInformation type) {
+      Spannable node, Entity analyzed, Entity element, TypeInformation type) {
     types.getInferredTypeOf(element).addAssignment(type);
   }
 
   /**
    * Records that [node] sets non-final field [element] to be of type
    * [type].
    */
   void recordTypeOfNonFinalField(
-      Spannable node, Element element, TypeInformation type) {
+      Spannable node, Entity element, TypeInformation type) {
     types.getInferredTypeOf(element).addAssignment(type);
   }
 
   /**
    * Records that [element] is of type [type].
    */
-  void recordType(Element element, TypeInformation type) {
+  void recordType(Entity element, TypeInformation type) {
     types.getInferredTypeOf(element).addAssignment(type);
   }
 
   /**
    * Records that the return type [element] is of type [type].
    */
   void recordReturnType(Element element, TypeInformation type) {
     TypeInformation info = types.getInferredTypeOf(element);
     if (element.name == '==') {
       // Even if x.== doesn't return a bool, 'x == null' evaluates to 'false'.
@@ skipping 275 matching lines @@
   /**
    * Records that the captured variable [local] is read.
    */
   void recordCapturedLocalRead(Local local) {}
 
   /**
    * Records that the variable [local] is being updated.
    */
   void recordLocalUpdate(Local local, TypeInformation type) {}
 }