Move .getLocalFunction from KernelToElementMap to KernelToLocalsMap

pkg/compiler/lib/src/kernel/element_map.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 '../closure.dart';
 import '../common.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
@@ skipping 45 matching lines @@
   /// Returns the [ConstructorEntity] corresponding to the generative or factory
   /// constructor [node].
   ConstructorEntity getConstructor(ir.Member node);
 
   /// Returns the [FieldEntity] corresponding to the field [node].
   FieldEntity getField(ir.Field node);
 
   /// Returns the [ClassEntity] corresponding to the class [node].
   ClassEntity getClass(ir.Class node);
 
-  /// Returns the [Local] corresponding to the [node]. The node must be either
-  /// a [ir.FunctionDeclaration] or [ir.FunctionExpression].
-  // TODO(johnniwinther): Move this to [KernelToElementMapForImpact].
-  Local getLocalFunction(ir.TreeNode node);
-
   /// Returns the super [MemberEntity] for a super invocation, get or set of
   /// [name] from the member [context].
   ///
   /// The IR doesn't always resolve super accesses to the corresponding
   /// [target]. If not, the target is computed using [name] and [setter] from
   /// the enclosing class of [context].
   MemberEntity getSuperMember(ir.Member context, ir.Name name, ir.Member target,
       {bool setter: false});
 
   /// Returns the [Name] corresponding to [name].
@@ skipping 66 matching lines @@
   /// Computes the native behavior for calling [procedure].
   native.NativeBehavior getNativeBehaviorForMethod(ir.Procedure procedure,
       {bool isJsInterop});
 
   /// Compute the kind of foreign helper function called by [node], if any.
   ForeignKind getForeignKind(ir.StaticInvocation node);
 
   /// Computes the [InterfaceType] referenced by a call to the
   /// [JS_INTERCEPTOR_CONSTANT] function, if any.
   InterfaceType getInterfaceTypeForJsInterceptorCall(ir.StaticInvocation node);
+
+  /// Returns the [Local] corresponding to the [node]. The node must be either
+  /// a [ir.FunctionDeclaration] or [ir.FunctionExpression].
+  Local getLocalFunction(ir.TreeNode node);
 }
 
 /// Interface that translates between Kernel IR nodes and entities used for
 /// global type inference and building the SSA graph for members.
 abstract class KernelToElementMapForBuilding implements KernelToElementMap {
   /// [ElementEnvironment] for library, class and member lookup.
   ElementEnvironment get elementEnvironment;
 
   /// Returns the list of [DartType]s corresponding to [types].
   List<DartType> getDartTypes(List<ir.DartType> types);
@@ skipping 188 matching lines @@
   /// Returns the inferred type of a dynamic [selector] access on a receiver of
   /// type [mask].
   TypeMask selectorTypeOf(Selector selector, TypeMask mask);
 
   /// Returns the returned type annotation in the [nativeBehavior].
   TypeMask typeFromNativeBehavior(
       native.NativeBehavior nativeBehavior, ClosedWorld closedWorld);
 }
 
 /// Map from kernel IR nodes to local entities.
-// TODO(johnniwinther): Add `getLocalFunction`.
 abstract class KernelToLocalsMap {
   /// The member currently being built.
   MemberEntity get currentMember;
 
   // TODO(johnniwinther): Make these return the [KernelToLocalsMap] to use from
   // now on.
   /// Call to notify that [member] is currently being inlined.
   void enterInlinedMember(covariant MemberEntity member);
 
   /// Call to notify that [member] is no longer being inlined.
   void leaveInlinedMember(covariant MemberEntity member);
 
   /// Returns the [Local] for [node].
-  Local getLocal(ir.VariableDeclaration node);
+  Local getLocalVariable(ir.VariableDeclaration node);
+
+  /// Returns the [Local] corresponding to the [node]. The node must be either
+  /// a [ir.FunctionDeclaration] or [ir.FunctionExpression].
+  Local getLocalFunction(ir.TreeNode node);
 
   /// Returns the [JumpTarget] for the break statement [node].
   JumpTarget getJumpTargetForBreak(ir.BreakStatement node);
 
   /// Returns `true` if [node] should generate a `continue` to its [JumpTarget].
   bool generateContinueForBreak(ir.BreakStatement node);
 
   /// Returns the [JumpTarget] defined by the labelled statement [node] or
   /// `null` if [node] is not a jump target.
   JumpTarget getJumpTargetForLabel(ir.LabeledStatement node);
@@ skipping 29 matching lines @@
   /// [closureClassMaps].
   CapturedLoopScope getCapturedLoopScope(
       ClosureDataLookup closureLookup, ir.TreeNode node);
 }
 
 /// Comparator for the canonical order or named arguments.
 // TODO(johnniwinther): Remove this when named parameters are sorted in dill.
 int namedOrdering(ir.VariableDeclaration a, ir.VariableDeclaration b) {
   return a.name.compareTo(b.name);
 }