Handle variable declarations in inferrer

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 '../elements/types.dart';
 import '../kernel/element_map.dart';
+import '../kernel/indexed.dart';
 
 class GlobalLocalsMap {
   Map<MemberEntity, KernelToLocalsMap> _localsMaps =
       <MemberEntity, KernelToLocalsMap>{};
 
   /// Returns the [KernelToLocalsMap] for [member].
   KernelToLocalsMap getLocalsMap(MemberEntity member) {
     return _localsMaps.putIfAbsent(
         member, () => new KernelToLocalsMapImpl(member));
   }
 
   /// Associates [localsMap] with [member].
   ///
   /// Use this for sharing maps between members that share IR nodes.
   void setLocalsMap(MemberEntity member, KernelToLocalsMap localsMap) {
     assert(!_localsMaps.containsKey(member),
         "Locals map already created for $member.");
     _localsMaps[member] = localsMap;
   }
 }
 
 class KernelToLocalsMapImpl implements KernelToLocalsMap {
   final List<MemberEntity> _members = <MemberEntity>[];
+  final EntityDataMap<JLocal, LocalData> _locals =
+      new EntityDataMap<JLocal, LocalData>();
   Map<ir.VariableDeclaration, JLocal> _map = <ir.VariableDeclaration, JLocal>{};
   Map<ir.TreeNode, JJumpTarget> _jumpTargetMap;
   Set<ir.BreakStatement> _breaksAsContinue;
-  List<ir.VariableDeclaration> _parameterList = <ir.VariableDeclaration>[];
 
   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);
 
       // Find the root node for the current member.
       while (node is! ir.Member) {
@@ skipping 80 matching lines @@
 
   @override
   JumpTarget getJumpTargetForWhile(ir.WhileStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
   Local getLocalVariable(ir.VariableDeclaration node) {
     return _map.putIfAbsent(node, () {
-      Local local;
-      if (node.parent is ir.FunctionNode) {
-        local = new JParameter(_parameterList.length, node.name, currentMember);
-        _parameterList.add(node);
-      } else {
-        local = new JLocal(node.name, currentMember);
-      }
+      JLocal local = new JLocal(node.name, currentMember,
+          isRegularParameter: node.parent is ir.FunctionNode);
+      _locals.register<JLocal, LocalData>(local, new LocalData(node));
       return local;
     });
   }
 
   @override
-  ir.FunctionNode getFunctionNodeForParameter(covariant JParameter parameter) {
-    return _parameterList[parameter.parameterIndex].parent;
-  }
-
-  ir.DartType getParameterType(covariant JParameter parameter) {
-    return _parameterList[parameter.parameterIndex].type;
+  ir.FunctionNode getFunctionNodeForParameter(covariant JLocal parameter) {
+    return _locals.getData(parameter).functionNode;
   }
 
   @override
+  DartType getLocalType(KernelToElementMap elementMap, covariant JLocal local) {
+    return _locals.getData(local).getDartType(elementMap);
+  }
+
+  @override
   CapturedLoopScope getCapturedLoopScope(
       ClosureDataLookup closureLookup, ir.TreeNode node) {
     return closureLookup.getCapturedLoopScope(node);
   }
 
   @override
   ClosureRepresentationInfo getClosureRepresentationInfo(
       ClosureDataLookup closureLookup, ir.TreeNode node) {
     return closureLookup.getClosureInfo(node);
   }
@@ skipping 203 matching lines @@
     sb.write(labelName);
     sb.write(',isBreakTarget=');
     sb.write(isBreakTarget);
     sb.write(',isContinueTarget=');
     sb.write(isContinueTarget);
     sb.write(')');
     return sb.toString();
   }
 }
 
-class JLocal implements Local {
+class JLocal extends IndexedLocal {
   final String name;
   final MemberEntity memberContext;
 
-  JLocal(this.name, this.memberContext);
+  /// True if this local represents a local parameter.
+  final bool isRegularParameter;
 
-  /// True if this local represents a local parameter.
-  bool get isRegularParameter => false;
+  JLocal(this.name, this.memberContext, {this.isRegularParameter: false});
 
   @override
   Entity get executableContext => memberContext;
 
   String get _kind => 'local';
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write('$_kind(');
     if (memberContext.enclosingClass != null) {
       sb.write(memberContext.enclosingClass.name);
       sb.write('.');
     }
     sb.write(memberContext.name);
     sb.write('#');
     sb.write(name);
     sb.write(')');
     return sb.toString();
   }
 }
 
-class JParameter extends JLocal {
-  final int parameterIndex;
+class LocalData {
+  final ir.VariableDeclaration node;
 
-  JParameter(this.parameterIndex, String name, MemberEntity memberContext)
-      : super(name, memberContext);
+  DartType _type;
 
-  bool get isRegularParameter => true;
+  LocalData(this.node);
 
-  String get _kind => 'parameter';
+  DartType getDartType(KernelToElementMap elementMap) {
+    return _type ??= elementMap.getDartType(node.type);
+  }
+
+  ir.FunctionNode get functionNode => node.parent;
 }