Handle instance/super methods in js_model/model_test

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 '../closure.dart' show ClosureConversionTask;
 import '../common/tasks.dart';
 import '../common_elements.dart';
 import '../compiler.dart';
@@ skipping 34 matching lines @@
 
   KernelToElementMapForBuilding get elementMap {
     assert(_elementMap != null,
         "JsBackendStrategy.elementMap has not been created yet.");
     return _elementMap;
   }
 
   GlobalLocalsMap get globalLocalsMapForTesting => _globalLocalsMap;
 
   @override
-  ClosedWorldRefiner createClosedWorldRefiner(ClosedWorld closedWorld) {
+  ClosedWorldRefiner createClosedWorldRefiner(
+      covariant ClosedWorldBase closedWorld) {
     KernelFrontEndStrategy strategy = _compiler.frontendStrategy;
     KernelToElementMapForImpact elementMap = strategy.elementMap;
     _elementMap = new JsKernelToElementMap(
         _compiler.reporter, _compiler.environment, elementMap);
     _elementEnvironment = _elementMap.elementEnvironment;
     _commonElements = _elementMap.commonElements;
     JsToFrontendMap _map = _elementMap.jsToFrontendMap;
     BackendUsage backendUsage =
         new JsBackendUsage(_map, closedWorld.backendUsage);
     NativeData nativeData = new JsNativeData(_map, closedWorld.nativeData);
@@ skipping 39 matching lines @@
         return newClassSet;
       });
     }
 
     closedWorld
         .getClassHierarchyNode(closedWorld.commonElements.objectClass)
         .forEachSubclass((ClassEntity cls) {
       convertClassSet(closedWorld.getClassSet(cls));
     }, ClassHierarchyNode.ALL);
 
+    List<MemberEntity> liveInstanceMembers =
+        closedWorld.liveInstanceMembers.map(_map.toBackendMember).toList();
+
+    Map<ClassEntity, Set<ClassEntity>> mixinUses =
+        <ClassEntity, Set<ClassEntity>>{};
+    closedWorld.mixinUses.forEach((ClassEntity cls, Set<ClassEntity> uses) {
+      mixinUses[_map.toBackendClass(cls)] =
+          uses.map(_map.toBackendClass).toSet();
+    });
+
     return new JsClosedWorld(
         elementEnvironment: _elementEnvironment,
         dartTypes: _elementMap.types,
         commonElements: _commonElements,
         constantSystem: const JavaScriptConstantSystem(),
         backendUsage: backendUsage,
         nativeData: nativeData,
         interceptorData: interceptorData,
         classHierarchyNodes: classHierarchyNodes,
         classSets: classSets,
         implementedClasses: implementedClasses,
+        liveInstanceMembers: liveInstanceMembers,
         // TODO(johnniwinther): Support these.
         allTypedefs: new ImmutableEmptySet<TypedefElement>(),
         resolutionWorldBuilder: null,
-        functionSet: null,
-        mixinUses: null,
+        mixinUses: mixinUses,

[Siggi Cherem (dart-lang), 2017/07/05 20:28:52]

is there more to this than what you have above?

[Johnni Winther, 2017/07/06 14:14:46]

No. Moved

         typesImplementedBySubclasses: null);
   }
 
   @override
   Sorter get sorter {
     return _sorter ??= new KernelSorter(elementMap);
   }
 
   @override
   ClosureConversionTask get closureDataLookup =>
@@ skipping 22 matching lines @@
       ClosedWorld closedWorld,
       SelectorConstraintsStrategy selectorConstraintsStrategy) {
     return new KernelCodegenWorldBuilder(
         elementMap,
         closedWorld.elementEnvironment,
         nativeBasicData,
         closedWorld,
         selectorConstraintsStrategy);
   }
 }