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 93 matching lines @@
 
   KernelSsaBuilderTask(this._compiler) : super(_compiler.measurer);
 
   KernelToElementMapImpl get _elementMap {
     KernelFrontEndStrategy frontendStrategy = _compiler.frontendStrategy;
     return frontendStrategy.elementMap;
   }
 
   @override
   HGraph build(CodegenWorkItem work, ClosedWorld closedWorld) {
+    KernelToLocalsMap localsMap = new KernelToLocalsMapImpl(work.element);
     KernelSsaBuilder builder = new KernelSsaBuilder(
         work.element,
         work.element.enclosingClass,
         _elementMap.getMemberNode(work.element),
         _compiler,
         _elementMap,
         new KernelToTypeInferenceMapImpl(closedWorld),
-        new KernelToLocalsMapImpl(work.element),
+        localsMap,
         closedWorld,
         _compiler.codegenWorldBuilder,
         work.registry,
+        new KernelClosureDataLookup(_elementMap, localsMap),
         // TODO(johnniwinther): Support these:
-        const KernelClosureDataLookup(),
         const SourceInformationBuilder(),
         null, // Function node used as capture scope id.
         targetIsConstructorBody: false);
     return builder.build();
   }
 }
 
 class KernelToTypeInferenceMapImpl implements KernelToTypeInferenceMap {
   final ClosedWorld _closedWorld;
 
@@ skipping 109 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
   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();
   }
 }
 
-/// TODO(johnniwinther,efortuna): Implement this.
-class KernelClosureDataLookup implements ClosureDataLookup<ir.Node> {
-  const KernelClosureDataLookup();
-
-  @override
-  ClosureAnalysisInfo getClosureAnalysisInfo(ir.Node node) {
-    return const ClosureAnalysisInfo();
-  }
-
-  @override
-  LoopClosureRepresentationInfo getClosureRepresentationInfoForLoop(
-      ir.Node loopNode) {
-    return const LoopClosureRepresentationInfo();
-  }
-
-  @override
-  ClosureRepresentationInfo getClosureRepresentationInfo(Entity entity) {
-    if (entity is MemberEntity) {
-      ThisLocal thisLocal;
-      if (entity.isInstanceMember) {
-        thisLocal = new ThisLocal(entity);
-      }
-      return new ClosureClassMap(null, null, null, thisLocal);
-    }
-    return const ClosureRepresentationInfo();
-  }
-}
-
 class KernelSorter implements Sorter {
   final KernelToElementMapImpl elementMap;
 
   KernelSorter(this.elementMap);
 
   int _compareLibraries(LibraryEntity a, LibraryEntity b) {
     return utils.compareLibrariesUris(a.canonicalUri, b.canonicalUri);
   }
 
   int _compareNodes(
@@ skipping 27 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));
       });
   }
 }