Compute KernelClosureRepresentationInfo.variableIsUsedInTryOrSync

pkg/compiler/lib/src/kernel/kernel_backend_strategy.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.backend_strategy;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../backend_strategy.dart';
 import '../closure.dart';
@@ skipping 15 matching lines @@
 import '../options.dart';
 import '../ssa/builder_kernel.dart';
 import '../ssa/nodes.dart';
 import '../ssa/ssa.dart';
 import '../ssa/types.dart';
 import '../types/types.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';
 import '../universe/world_impact.dart';
 import '../world.dart';
+import 'closure.dart';
 import 'element_map_impl.dart';
 import 'kernel_strategy.dart';
 
 /// Backend strategy that uses the kernel elements as the backend model.
 // TODO(johnniwinther): Replace this with a strategy based on the J-element
 // model.
 class KernelBackendStrategy implements BackendStrategy {
   final Compiler _compiler;
   Sorter _sorter;
 
@@ skipping 90 matching lines @@
 /// Task for building SSA from kernel IR loaded from .dill.
 class KernelSsaBuilder implements SsaBuilder {
   final CompilerTask task;
   final Compiler _compiler;
   final KernelToElementMap _elementMap;
 
   KernelSsaBuilder(this.task, this._compiler, this._elementMap);
 
   @override
   HGraph build(CodegenWorkItem work, ClosedWorld closedWorld) {
+    KernelToLocalsMap localsMap = new KernelToLocalsMapImpl(work.element);
     KernelSsaGraphBuilder builder = new KernelSsaGraphBuilder(
         work.element,
         work.element.enclosingClass,
         _elementMap.getMemberNode(work.element),
         _compiler,
         _elementMap,
         new KernelToTypeInferenceMapImpl(closedWorld),
-        new KernelToLocalsMapImpl(work.element),
+        localsMap,
         closedWorld,
         _compiler.codegenWorldBuilder,
         work.registry,
-        _compiler.closureDataLookup,
+        new KernelClosureDataLookup(_elementMap, localsMap),
         // TODO(johnniwinther): Support these:
         const SourceInformationBuilder(),
         null, // Function node used as capture scope id.
         targetIsConstructorBody: false);
     return builder.build();
   }
 }
 
 class KernelToTypeInferenceMapImpl implements KernelToTypeInferenceMap {
   final ClosedWorld _closedWorld;
@@ skipping 110 matching lines @@
   @override
   Local getLocal(ir.VariableDeclaration node) {
     return _map.putIfAbsent(node, () {
       return new KLocal(node.name, currentMember);
     });
   }
 
   @override
   LoopClosureRepresentationInfo getClosureRepresentationInfoForLoop(
       ClosureDataLookup closureLookup, ir.TreeNode node) {
-    return const LoopClosureRepresentationInfo();
+    return closureLookup.getClosureRepresentationInfoForLoop(node);
   }
 }
 
 class KLocal implements Local {
   final String name;
   final MemberEntity memberContext;
 
   KLocal(this.name, this.memberContext);
 
   @override
@@ skipping 105 matching lines @@
   Iterable<ClassEntity> sortClasses(Iterable<ClassEntity> classes) {
     return classes.toList()
       ..sort((ClassEntity a, ClassEntity b) {
         int r = _compareLibraries(a.library, b.library);
         if (r != 0) return r;
         return _compareNodes(
             a, elementMap.getClassNode(a), b, elementMap.getClassNode(b));
       });
   }
 }