Use KernelTypeGraphBuilder in KernelInferrerEngine

pkg/compiler/lib/src/js_model/js_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.js_model.strategy;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart' show ClosureConversionTask;
 import '../common.dart';
@@ skipping 27 matching lines @@
 import '../world.dart';
 import 'closure.dart';
 import 'elements.dart';
 import 'locals.dart';
 
 class JsBackendStrategy implements KernelBackendStrategy {
   final Compiler _compiler;
   ElementEnvironment _elementEnvironment;
   CommonElements _commonElements;
   JsKernelToElementMap _elementMap;
-  ClosureConversionTask _closureDataLookup;
+  KernelClosureConversionTask _closureDataLookup;
   final GlobalLocalsMap _globalLocalsMap = new GlobalLocalsMap();
   Sorter _sorter;
 
   JsBackendStrategy(this._compiler);
 
   KernelToElementMapForBuilding get elementMap {
     assert(_elementMap != null,
         "JsBackendStrategy.elementMap has not been created yet.");
     return _elementMap;
   }
@@ skipping 226 matching lines @@
     Map<ClassEntity, Set<ClassEntity>> typesImplementedBySubclasses =
         map.toBackendClassMap(
             closedWorld.typesImplementedBySubclasses, map.toBackendClassSet);
 
     Iterable<MemberEntity> assignedInstanceMembers =
         map.toBackendMemberSet(closedWorld.assignedInstanceMembers);
 
     Iterable<ClassEntity> liveNativeClasses =
         map.toBackendClassSet(closedWorld.liveNativeClasses);
 
+    Iterable<MemberEntity> processedMembers =
+        map.toBackendMemberSet(closedWorld.processedMembers);
+
     RuntimeTypesNeed rtiNeed =
         _convertRuntimeTypesNeed(map, backendUsage, closedWorld.rtiNeed);
 
     return new JsClosedWorld(_elementMap,
         elementEnvironment: _elementEnvironment,
         dartTypes: _elementMap.types,
         commonElements: _commonElements,
         constantSystem: const JavaScriptConstantSystem(),
         backendUsage: backendUsage,
         nativeData: nativeData,
         interceptorData: interceptorData,
         rtiNeed: rtiNeed,
         classHierarchyNodes: classHierarchyNodes,
         classSets: classSets,
         implementedClasses: implementedClasses,
         liveNativeClasses: liveNativeClasses,
         liveInstanceMembers: liveInstanceMembers,
         assignedInstanceMembers: assignedInstanceMembers,
+        processedMembers: processedMembers,
         mixinUses: mixinUses,
         typesImplementedBySubclasses: typesImplementedBySubclasses,
         // TODO(johnniwinther): Support this:
         allTypedefs: new ImmutableEmptySet<TypedefEntity>());
   }
 
   @override
   Sorter get sorter {
     return _sorter ??= new KernelSorter(elementMap);
   }
@@ skipping 31 matching lines @@
   }
 
   @override
   SourceSpan spanFromSpannable(Spannable spannable, Entity currentElement) {
     return _elementMap.getSourceSpan(spannable, currentElement);
   }
 
   @override
   TypesInferrer createTypesInferrer(ClosedWorldRefiner closedWorldRefiner,
       {bool disableTypeInference: false}) {
-    return new KernelTypeGraphInferrer(
-        _compiler, closedWorldRefiner.closedWorld, closedWorldRefiner,
+    return new KernelTypeGraphInferrer(_compiler, _elementMap, _globalLocalsMap,
+        _closureDataLookup, closedWorldRefiner.closedWorld, closedWorldRefiner,
         disableTypeInference: disableTypeInference);
   }
 }
 
 class JsClosedWorld extends ClosedWorldBase with KernelClosedWorldMixin {
   final JsKernelToElementMap elementMap;
   final RuntimeTypesNeed rtiNeed;
 
   JsClosedWorld(this.elementMap,
       {ElementEnvironment elementEnvironment,
       DartTypes dartTypes,
       CommonElements commonElements,
       ConstantSystem constantSystem,
       NativeData nativeData,
       InterceptorData interceptorData,
       BackendUsage backendUsage,
       this.rtiNeed,
       Set<ClassEntity> implementedClasses,
       Iterable<ClassEntity> liveNativeClasses,
       Iterable<MemberEntity> liveInstanceMembers,
       Iterable<MemberEntity> assignedInstanceMembers,
+      Iterable<MemberEntity> processedMembers,
       Set<TypedefEntity> allTypedefs,
       Map<ClassEntity, Set<ClassEntity>> mixinUses,
       Map<ClassEntity, Set<ClassEntity>> typesImplementedBySubclasses,
       Map<ClassEntity, ClassHierarchyNode> classHierarchyNodes,
       Map<ClassEntity, ClassSet> classSets})
       : super(
             elementEnvironment,
             dartTypes,
             commonElements,
             constantSystem,
             nativeData,
             interceptorData,
             backendUsage,
             implementedClasses,
             liveNativeClasses,
             liveInstanceMembers,
             assignedInstanceMembers,
+            processedMembers,
             allTypedefs,
             mixinUses,
             typesImplementedBySubclasses,
             classHierarchyNodes,
             classSets);
 
   /// Construct a closure class and set up the necessary class inference
   /// hierarchy.
   KernelClosureClass buildClosureClass(
       MemberEntity member,
@@ skipping 29 matching lines @@
     node.isDirectlyInstantiated = true;
 
     return cls;
   }
 
   @override
   void registerClosureClass(ClassEntity cls) {
     throw new UnsupportedError('JsClosedWorld.registerClosureClass');
   }
 }