Add boxed fields in closure classes.

pkg/compiler/lib/src/kernel/element_map_impl.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.kernel.element_map;
 
 import 'package:kernel/ast.dart' as ir;
 
+import '../closure.dart' show BoxLocal;
 import '../common.dart';
 import '../common/names.dart' show Identifiers;
 import '../common/resolution.dart';
 import '../compile_time_constants.dart';
 import '../constants/constant_system.dart';
 import '../constants/constructors.dart';
 import '../constants/evaluation.dart';
 import '../constants/expressions.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
@@ skipping 1970 matching lines @@
 
   KernelClosureClass constructClosureClass(
       MemberEntity member,
       ir.FunctionNode node,
       JLibrary enclosingLibrary,
       KernelScopeInfo info,
       ir.Location location,
       KernelToLocalsMap localsMap,
       InterfaceType supertype) {
     String name = _computeClosureName(node);
-    KernelClosureClass cls = new KernelClosureClass.fromScopeInfo(
-        name, _classEnvs.length, enclosingLibrary, info, location, localsMap);
+    KernelClosureClass cls = new KernelClosureClass.fromScopeInfo(node, name,
+        _classEnvs.length, enclosingLibrary, info, location, localsMap);
     _classList.add(cls);
     _classEnvs.add(new ClassEnv.closureClass());
 
     // Create a classData and set up the interfaces and subclass
     // relationships that _ensureSupertypes and _ensureThisAndRawType are doing
     var closureData =
         new ClassData(null, new ClosureClassDefinition(cls, cls.location));
     closureData
       ..isMixinApplication = false
       ..thisType =
           closureData.rawType = new InterfaceType(cls, const/*<DartType>*/ [])
       ..supertype = supertype
       ..interfaces = const <InterfaceType>[];
     var setBuilder = new _KernelOrderedTypeSetBuilder(this, cls);
     _classData.add(closureData);
     closureData.orderedTypeSet = setBuilder.createOrderedTypeSet(
         closureData.supertype, const Link<InterfaceType>());
 
     int i = 0;
     for (ir.VariableDeclaration variable in info.freeVariables) {
       // Make a corresponding field entity in this closure class for every
       // single freeVariable in the KernelScopeInfo.freeVariable.
-      _constructClosureFields(cls, variable, i, localsMap);
+      _constructClosureFields(
+          cls, variable, i, info.capturedVariablesAccessor, localsMap);
       i++;
     }
 
     cls.callMethod = new JClosureCallMethod(_memberData.length, cls, member);
     _memberList.add(cls.callMethod);
     _memberData.add(new MemberData(
         null,
         new ClosureMemberDefinition(
             member, cls.location, MemberKind.closureCall, node.parent)));
 
     // TODO(efortuna): Does getMetadata get called in ClassData for this object?
     return cls;
   }
 
   _constructClosureFields(
       KernelClosureClass cls,
       ir.VariableDeclaration variable,
       int fieldNumber,
+      NodeBox box,
       KernelToLocalsMap localsMap) {
     // NOTE: This construction order may be slightly different than the
     // old Element version. The old version did all the boxed items and then
     // all the others.
     Local capturedLocal = localsMap.getLocalVariable(variable);
     if (cls.isBoxed(capturedLocal)) {
-      // TODO(efortuna): Coming soon.
+      var boxedField = new JBoxedField(
+          _getClosureVariableName(capturedLocal.name, fieldNumber),
+          _memberData.length,
+          new BoxLocal(
+              box.name,
+              localsMap.getLocalVariable(box.executableContext),

[Johnni Winther, 2017/08/01 09:09:10]

The `Local.executableContext` is actually not needed after closure translation.
I'll remove it when you're done with the closure conversion.

[Emily Fortuna, 2017/08/01 19:30:06]

Acknowledged.

+              getMember(box.memberContext)),

[Johnni Winther, 2017/08/01 09:09:10]

The member is always the member passed to [constructClosureClass], just use this
here and avoid the need for memberContext computation.

[Emily Fortuna, 2017/08/01 19:30:06]

Done.

+          cls,
+          variable.isConst,
+          variable.isFinal || variable.isConst);
+      cls.localToFieldMap[capturedLocal] = boxedField;
+      _memberList.add(boxedField);
+      _memberData.add(new MemberData(
+          null,
+          new ClosureMemberDefinition(boxedField, variable.location,
+              MemberKind.closureField, variable)));
     } else {
       var closureField = new JClosureField(
           _getClosureVariableName(capturedLocal.name, fieldNumber),
           _memberData.length,
           cls,
           variable.isConst,
           variable.isFinal || variable.isConst);
       cls.localToFieldMap[capturedLocal] = closureField;
       _memberList.add(closureField);
       _memberData.add(new MemberData(
@@ skipping 57 matching lines @@
   ///
   /// These names are not used in generated code, just as element name.
   String _getClosureVariableName(String name, int id) {
     return "_captured_${name}_$id";
   }
 
   String getDeferredUri(ir.LibraryDependency node) {
     throw new UnimplementedError('JsKernelToElementMap.getDeferredUri');
   }
 }