Handle instance/super methods in js_model/model_test

pkg/compiler/lib/src/universe/resolution_world_builder.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.
 
 part of world_builder;
 
 abstract class ResolutionWorldBuilder implements WorldBuilder, OpenWorld {
   /// Set of all local functions in the program. Used by the mirror tracking
   /// system to find all live closure instances.
   Iterable<Local> get localFunctions;
@@ skipping 336 matching lines @@
   final BackendUsageBuilder _backendUsageBuilder;
 
   final SelectorConstraintsStrategy selectorConstraintsStrategy;
 
   bool hasRuntimeTypeSupport = false;
   bool hasIsolateSupport = false;
   bool hasFunctionApplySupport = false;
 
   bool _closed = false;
   ClosedWorld _closedWorldCache;
-  FunctionSetBuilder _allFunctions;
+  final Set<MemberEntity> _liveInstanceMembers = new Set<MemberEntity>();
 
   final Set<TypedefElement> _allTypedefs = new Set<TypedefElement>();
 
   final Map<ClassEntity, Set<ClassEntity>> _mixinUses =
       new Map<ClassEntity, Set<ClassEntity>>();
 
   // We keep track of subtype and subclass relationships in four
   // distinct sets to make class hierarchy analysis faster.
   final Map<ClassEntity, ClassHierarchyNode> _classHierarchyNodes =
       <ClassEntity, ClassHierarchyNode>{};
   final Map<ClassEntity, ClassSet> _classSets = <ClassEntity, ClassSet>{};
 
   final Set<ConstantValue> _constantValues = new Set<ConstantValue>();
 
   bool get isClosed => _closed;
 
   ResolutionWorldBuilderBase(
       this._elementEnvironment,
       this._dartTypes,
       this._commonElements,
       this._constantSystem,
       this._nativeBasicData,
       this._nativeDataBuilder,
       this._interceptorDataBuilder,
       this._backendUsageBuilder,
-      this.selectorConstraintsStrategy) {
-    _allFunctions = new FunctionSetBuilder();
-  }
+      this.selectorConstraintsStrategy);
 
   Iterable<ClassEntity> get processedClasses => _processedClasses.keys
       .where((cls) => _processedClasses[cls].isInstantiated);
 
   ClosedWorld get closedWorldForTesting {
     if (!_closed) {
       throw new SpannableAssertionFailure(
           NO_LOCATION_SPANNABLE, "The world builder has not yet been closed.");
     }
     return _closedWorldCache;
@@ skipping 384 matching lines @@
       covariant ClassEntity mixinApplication, covariant ClassEntity mixin) {
     // TODO(johnniwinther): Add map restricted to live classes.
     // We don't support patch classes as mixin.
     Set<ClassEntity> users =
         _mixinUses.putIfAbsent(mixin, () => new Set<ClassEntity>());
     users.add(mixinApplication);
   }
 
   void registerUsedElement(MemberEntity element) {
     if (element.isInstanceMember && !element.isAbstract) {
-      _allFunctions.add(element);
+      _liveInstanceMembers.add(element);
     }
   }
 
   ClosedWorld get closedWorldCache {
     assert(isClosed);
     return _closedWorldCache;
   }
 
   @override
   bool isMemberUsed(MemberEntity member) {
@@ skipping 169 matching lines @@
     return _closedWorldCache = new KernelClosedWorld(elementMap,
         elementEnvironment: _elementEnvironment,
         dartTypes: _dartTypes,
         commonElements: _commonElements,
         nativeData: _nativeDataBuilder.close(),
         interceptorData: _interceptorDataBuilder.close(),
         backendUsage: _backendUsageBuilder.close(),
         constantSystem: _constantSystem,
         resolutionWorldBuilder: this,
         implementedClasses: _implementedClasses,
-        functionSet: _allFunctions.close(),
+        liveInstanceMembers: _liveInstanceMembers,
         allTypedefs: _allTypedefs,
         mixinUses: _mixinUses,
         typesImplementedBySubclasses: typesImplementedBySubclasses,
         classHierarchyNodes: _classHierarchyNodes,
         classSets: _classSets);
   }
 
   @override
   void registerClass(ClassEntity cls) {
     throw new UnimplementedError('KernelResolutionWorldBuilder.registerClass');
   }
 }