Merge _applyMemberUse and _applyStaticMemberUse in ResolutionEnqueuer

pkg/compiler/lib/src/enqueue.dart

 // Copyright (c) 2012, 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.enqueue;
 
 import 'dart:collection' show Queue;
 
 import 'cache_strategy.dart';
 import 'common/backend_api.dart' show Backend;
@@ skipping 206 matching lines @@
             'Unenqueued use of $member: ${useSet.iterable(MemberUse.values)}');
       }
     });
   }
 
   /// Callback for applying the use of a [member].
   void _applyMemberUse(Entity member, EnumSet<MemberUse> useSet) {
     if (useSet.contains(MemberUse.NORMAL)) {
       _addToWorkList(member);
     }
-    if (useSet.contains(MemberUse.CLOSURIZE)) {
+    if (useSet.contains(MemberUse.CLOSURIZE_INSTANCE)) {
       _registerClosurizedMember(member);
     }
+    if (useSet.contains(MemberUse.CLOSURIZE_STATIC)) {
+      applyImpact(backend.registerGetOfStaticFunction());
+    }
   }
 
   /// Callback for applying the use of a [cls].
   void _applyClassUse(ClassEntity cls, EnumSet<ClassUse> useSet) {
     if (useSet.contains(ClassUse.INSTANTIATED)) {
       _recentClasses.add(cls);
       _universe.processClassMembers(cls, _applyMemberUse);
       // We only tell the backend once that [cls] was instantiated, so
       // any additional dependencies must be treated as global
       // dependencies.
       applyImpact(backend.registerInstantiatedClass(cls, forResolution: true));
     }
     if (useSet.contains(ClassUse.IMPLEMENTED)) {
       applyImpact(backend.registerImplementedClass(cls, forResolution: true));
     }
   }
 
   void processDynamicUse(DynamicUse dynamicUse) {
     task.measure(() {
       _universe.registerDynamicUse(dynamicUse, _applyMemberUse);
     });
   }
 
-  /// Callback for applying the use of a [member].
-  void _applyStaticMemberUse(Entity member, EnumSet<MemberUse> useSet) {
-    if (useSet.contains(MemberUse.NORMAL)) {
-      _addToWorkList(member);
-    }
-    if (useSet.contains(MemberUse.CLOSURIZE)) {
-      applyImpact(backend.registerGetOfStaticFunction());
-    }
-  }
-
   void processStaticUse(StaticUse staticUse) {
-    _universe.registerStaticUse(staticUse, _applyStaticMemberUse);
+    _universe.registerStaticUse(staticUse, _applyMemberUse);
     // TODO(johnniwinther): Add `ResolutionWorldBuilder.registerConstructorUse`
     // for these:
     switch (staticUse.kind) {
       case StaticUseKind.CONSTRUCTOR_INVOKE:
       case StaticUseKind.CONST_CONSTRUCTOR_INVOKE:
         _registerInstantiatedType(staticUse.type,
             constructor: staticUse.element, globalDependency: false);
         break;
       case StaticUseKind.REDIRECTION:
         _registerInstantiatedType(staticUse.type,
@@ skipping 253 matching lines @@
 }
 
 typedef void _DeferredActionFunction();
 
 class _DeferredAction {
   final Element element;
   final _DeferredActionFunction action;
 
   _DeferredAction(this.element, this.action);
 }