Cleanup registration of closures

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 'common/resolution.dart' show Resolution;
 import 'common/tasks.dart' show CompilerTask;
@@ skipping 95 matching lines @@
 
   /// Called to notify to the backend that a class is implemented by an
   /// instantiated class. Any backend specific [WorldImpact] of this is
   /// returned.
   WorldImpact registerImplementedClass(ClassEntity cls);
 
   /// Called to register that a static function has been closurized. Any backend
   /// specific [WorldImpact] of this is returned.
   WorldImpact registerGetOfStaticFunction();
 
-  /// Called to instruct the backend to register that a closure exists for a
-  /// function on an instantiated generic class. Any backend specific
+  /// Called to register that [member] has been closurized. Any backend specific
   /// [WorldImpact] of this is returned.
-  WorldImpact registerClosureWithFreeTypeVariables(MemberEntity member);
-
-  /// Called to register that a member has been closurized. Any backend specific
-  /// [WorldImpact] of this is returned.
-  WorldImpact registerBoundClosure();
+  WorldImpact registerClosurizedMember(MemberEntity member);
 
   /// Called to register that [element] is statically known to be used. Any
   /// backend specific [WorldImpact] of this is returned.
   WorldImpact registerUsedElement(MemberEntity member);
 
   void onQueueOpen(Enqueuer enqueuer, FunctionEntity mainMethod,
       Iterable<LibraryEntity> libraries);
 
   /// Called when [enqueuer]'s queue is empty, but before it is closed.
   ///
@@ skipping 227 matching lines @@
   void _registerIsCheck(ResolutionDartType type) {
     type = _worldBuilder.registerIsCheck(type);
     // Even in checked mode, type annotations for return type and argument
     // types do not imply type checks, so there should never be a check
     // against the type variable of a typedef.
     assert(!type.isTypeVariable || !type.element.enclosingElement.isTypedef);
   }
 
   void _registerClosurizedMember(MemberElement element) {
     assert(element.isInstanceMember);
-    if (element.type.containsTypeVariables) {
-      applyImpact(listener.registerClosureWithFreeTypeVariables(element));
-      _worldBuilder.registerClosureWithFreeTypeVariables(element);
-    }
-    applyImpact(listener.registerBoundClosure());
+    applyImpact(listener.registerClosurizedMember(element));
     _worldBuilder.registerClosurizedMember(element);
   }
 
   void forEach(void f(WorkItem work)) {
     do {
       while (_queue.isNotEmpty) {
         // TODO(johnniwinther): Find an optimal process order.
         WorkItem work = _queue.removeLast();
         if (!_processedEntities.contains(work.element)) {
           strategy.processWorkItem(f, work);
@@ skipping 202 matching lines @@
   @override
   WorkItem createWorkItem(MemberElement element) {
     assert(invariant(element, element.isDeclaration));
     if (element.isMalformed) return null;
 
     assert(invariant(element, element is AnalyzableElement,
         message: 'Element $element is not analyzable.'));
     return _resolution.createWorkItem(element);
   }
 }