Fix the local variable lookup in the locals handler.

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';
@@ skipping 2147 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(
-        node, name, _classEnvs.length, enclosingLibrary, info, localsMap);
-    _classList.add(cls);
+    JClass classEntity =
+        new JClosureClass(localsMap, enclosingLibrary, _classEnvs.length, name);
+    _classList.add(classEntity);
     Map<String, MemberEntity> memberMap = <String, MemberEntity>{};
     _classEnvs.add(new ClosureClassEnv(memberMap));
 
     // 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, computeSourceSpanFromTreeNode(node)));
+    var closureData = new ClassData(
+        null,
+        new ClosureClassDefinition(
+            classEntity, computeSourceSpanFromTreeNode(node)));
     closureData
       ..isMixinApplication = false
-      ..thisType =
-          closureData.rawType = new InterfaceType(cls, const <DartType>[])
+      ..thisType = closureData.rawType =
+          new InterfaceType(classEntity, const <DartType>[])
       ..supertype = supertype
       ..interfaces = const <InterfaceType>[];
-    var setBuilder = new _KernelOrderedTypeSetBuilder(this, cls);
+    var setBuilder = new _KernelOrderedTypeSetBuilder(this, classEntity);
     _classData.add(closureData);
     closureData.orderedTypeSet = setBuilder.createOrderedTypeSet(
         closureData.supertype, const Link<InterfaceType>());
 
+    KernelClosureClass cls = new KernelClosureClass.fromScopeInfo(
+        classEntity, node, info, localsMap);
     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(member, cls, memberMap, variable, i,
           info.capturedVariablesAccessor, localsMap);
       i++;
     }
 
     FunctionEntity callMethod = cls.callMethod = new JClosureCallMethod(
@@ skipping 23 matching lines @@
     // 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)) {
       FieldEntity boxedField = new JBoxedField(
           _getClosureVariableName(capturedLocal.name, fieldNumber),
           _memberData.length,
           new BoxLocal(box.name,
               localsMap.getLocalVariable(box.executableContext), member),
-          cls,
+          cls.closureClassEntity,
           variable.isConst,
           variable.isFinal || variable.isConst);
       cls.localToFieldMap[capturedLocal] = boxedField;
       _memberList.add(boxedField);
       _memberData.add(new ClosureFieldData(new ClosureMemberDefinition(
           boxedField,
           computeSourceSpanFromTreeNode(variable),
           MemberKind.closureField,
           variable)));
       memberMap[boxedField.name] = boxedField;
@@ skipping 63 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');
   }
 }