Reapply "Add nonboxed closure class fields."

pkg/compiler/lib/src/js_model/closure_visitors.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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart';
 import '../elements/entities.dart';
 import '../kernel/element_map.dart';
 import 'closure.dart';
@@ skipping 85 matching lines @@
         if (node is ir.Procedure) {
           thisLocal = new ThisLocal(_kernelToElementMap.getMethod(node));
         } else if (node is ir.Field) {
           thisLocal = new ThisLocal(_kernelToElementMap.getField(node));
         }
       } else if (node is ir.Constructor) {
         thisLocal = new ThisLocal(_kernelToElementMap.getConstructor(node));
       }
 
       assert(_scopeInfoMap[_nodeToEntity(node)] != null);
+      KernelScopeInfo from = _scopeInfoMap[_nodeToEntity(node)];
       _scopesCapturedInClosureMap[node] = new KernelCapturedScope(
           capturedVariablesForScope,
           _nodeToEntity(_executableContext),
+          from.localsUsedInTryOrSync,
+          from.freeVariables,
+          from.localsMap,
           thisLocal);
     }
   }
 
   Entity _nodeToEntity(ir.Node node) {
     if (node is ir.Member) {
       return _kernelToElementMap.getMember(node);
     } else {
       return _kernelToElementMap.getLocalFunction(node);
     }
@@ skipping 95 matching lines @@
           boxedLoopVariables.add(_localsMap.getLocal(variable));
         }
       }
     });
     KernelCapturedScope scope = _scopesCapturedInClosureMap[node];
     if (scope == null) return;
     _scopesCapturedInClosureMap[node] = new KernelCapturedLoopScope(
         scope.boxedVariables,
         boxedLoopVariables,
         scope.context,
+        scope.localsUsedInTryOrSync,
+        scope.freeVariables,
+        _localsMap,
         scope.thisLocal);
   }
 
   void visitInvokable(ir.TreeNode node) {
     bool oldIsInsideClosure = _isInsideClosure;
     ir.Node oldExecutableContext = _executableContext;
     KernelScopeInfo oldScopeInfo = _currentScopeInfo;
 
     // _outermostNode is only null the first time we enter the body of the
     // field, constructor, or method that is being analyzed.
     _isInsideClosure = _outermostNode != null;
     _executableContext = node;
-    _currentScopeInfo = new KernelScopeInfo(_nodeToThisLocal(node));
+    _currentScopeInfo = new KernelScopeInfo(_nodeToThisLocal(node), _localsMap);
     if (_isInsideClosure) {
       _closuresToGenerate[node] = _currentScopeInfo;
     } else {
       _outermostNode = node;
       _scopeInfoMap[_originalEntity] = _currentScopeInfo;
     }
 
     enterNewScope(node, () {
       node.visitChildren(this);
     });
@@ skipping 61 matching lines @@
               nodeToConvert.isInstanceMember)) {
         return new ThisLocal(_kernelToElementMap.getConstructor(nodeToConvert));
       } else if (nodeToConvert is ir.Procedure &&
           nodeToConvert.isInstanceMember) {
         return new ThisLocal(_kernelToElementMap.getMethod(nodeToConvert));
       }
     }
     return null;
   }
 }