Fix the locals lookup of variables and partial implementation of boxing of variables.

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' show JClosureClass;
 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>{};
 
@@ skipping 99 matching lines @@
     return _jumpTargetMap[node];
   }
 
   @override
   JumpTarget getJumpTargetForWhile(ir.WhileStatement node) {
     _ensureJumpMap(node);
     return _jumpTargetMap[node];
   }
 
   @override
-  Local getLocalVariable(ir.VariableDeclaration node) {
+  Local getLocalVariable(ir.VariableDeclaration node,
+      {bool isClosureCallMethod = false}) {
+    if (isClosureCallMethod && !_map.containsKey(node)) {
+      // Node might correspond to a free variable in the closure class.
+      assert(currentMember.enclosingClass is JClosureClass);
+      return (currentMember.enclosingClass as JClosureClass)
+          .localsMap
+          .getLocalVariable(node);
+    }
     return _map.putIfAbsent(node, () {
-      return new JLocal(node.name, currentMember);
+      return new JLocal(
+          node.name, currentMember, node.parent is ir.FunctionNode);
     });
   }
 
   @override
   // TODO(johnniwinther): Split this out into two methods -- one for
   // FunctionDeclaration and one for FunctionExpression, since basically the
   // whole thing is different depending on the node type. The reason it's not
   // done yet is the version of this function that it's overriding has a little
   // bit of commonality.
   Local getLocalFunction(ir.TreeNode node) {
@@ skipping 132 matching lines @@
     sb.write(isContinueTarget);
     sb.write(']');
     return sb.toString();
   }
 }
 
 class JLocal implements Local {
   final String name;
   final MemberEntity memberContext;
 
-  JLocal(this.name, this.memberContext);
+  /// True if this local represents a local parameter.
+  final bool isRegularParameter;
+
+  JLocal(this.name, this.memberContext, [isParameter = false])
+      : isRegularParameter = isParameter;
 
   @override
   Entity get executableContext => memberContext;
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write('local(');
     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();
   }
 }