Move .getLocalFunction from KernelToElementMap to KernelToLocalsMap

pkg/compiler/lib/src/js_model/locals.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.
 
 library dart2js.js_model.locals;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart';
 import '../common.dart';
 import '../elements/entities.dart';
 import '../elements/jumps.dart';
 import '../kernel/element_map.dart';
 
 class GlobalLocalsMap {
   Map<MemberEntity, KernelToLocalsMap> _localsMaps =
       <MemberEntity, KernelToLocalsMap>{};
 
   KernelToLocalsMap getLocalsMap(MemberEntity member) {
     return _localsMaps.putIfAbsent(
         member, () => new KernelToLocalsMapImpl(member));
   }
 }
 
 class KernelToLocalsMapImpl implements KernelToLocalsMap {
   final List<MemberEntity> _members = <MemberEntity>[];
-  Map<ir.VariableDeclaration, JLocal> _map = <ir.VariableDeclaration, JLocal>{};
+  Map<ir.TreeNode, JLocal> _map = <ir.TreeNode, JLocal>{};
   Map<ir.TreeNode, JJumpTarget> _jumpTargetMap;
   Set<ir.BreakStatement> _breaksAsContinue;
 
   MemberEntity get currentMember => _members.last;
 
   // TODO(johnniwinther): Compute this eagerly from the root of the member.
   void _ensureJumpMap(ir.TreeNode node) {
     if (_jumpTargetMap == null) {
       JumpVisitor visitor = new JumpVisitor(currentMember);
 
@@ skipping 80 matching lines @@
     return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForWhile(ir.WhileStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
-  Local getLocal(ir.VariableDeclaration node) {
+  Local getLocalVariable(ir.VariableDeclaration node) {
     return _map.putIfAbsent(node, () {
       return new JLocal(node.name, currentMember);
     });
   }
 
   @override
+  Local getLocalFunction(ir.TreeNode node) {
+    assert(node is ir.FunctionDeclaration || node is ir.FunctionExpression,
+        failedAt(currentMember, 'Invalid local function node: $node'));
+    return _map.putIfAbsent(node, () {
+      String name;
+      if (node is ir.FunctionDeclaration) {
+        name = node.variable.name;
+      } else if (node is ir.FunctionExpression) {
+        name = '';
+      }
+      return new JLocal(name, currentMember);
+    });
+  }
+
+  @override
   CapturedLoopScope getCapturedLoopScope(
       ClosureDataLookup closureLookup, ir.TreeNode node) {
     return closureLookup.getCapturedLoopScope(node);
   }
 }
 
 class JumpVisitor extends ir.Visitor {
   int index = 0;
   final MemberEntity member;
   final Map<ir.TreeNode, JJumpTarget> jumpTargetMap =
@@ skipping 125 matching lines @@
       sb.write(memberContext.enclosingClass.name);
       sb.write('.');
     }
     sb.write(memberContext.name);
     sb.write('#');
     sb.write(name);
     sb.write(')');
     return sb.toString();
   }
 }