Move processing of instance members from ResolutionEnqueuer to ResolutionWorldBuilderImpl

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;
 import 'common/names.dart' show Identifiers;
 import 'common/resolution.dart' show Resolution, ResolutionWorkItem;
 import 'common/tasks.dart' show CompilerTask;
 import 'common/work.dart' show WorkItem;
 import 'common.dart';
 import 'compiler.dart' show Compiler, GlobalDependencyRegistry;
 import 'core_types.dart' show CommonElements;
 import 'options.dart';
 import 'dart_types.dart' show DartType, InterfaceType;
 import 'elements/elements.dart'
     show
         AnalyzableElement,
         AstElement,
         ClassElement,
         ConstructorElement,
         Element,
         Entity,
-        FunctionElement,
         LibraryElement,
         LocalFunctionElement,
-        TypedElement;
+        MemberElement;
+import 'elements/entities.dart';
 import 'native/native.dart' as native;
 import 'types/types.dart' show TypeMaskStrategy;
-import 'universe/selector.dart' show Selector;
 import 'universe/world_builder.dart';
 import 'universe/use.dart'
     show DynamicUse, StaticUse, StaticUseKind, TypeUse, TypeUseKind;
 import 'universe/world_impact.dart'
     show ImpactStrategy, ImpactUseCase, WorldImpact, WorldImpactVisitor;
+import 'util/enumset.dart';
 import 'util/util.dart' show Setlet;
 import 'world.dart' show OpenWorld;
 
 class EnqueueTask extends CompilerTask {
   ResolutionEnqueuer _resolution;
   Enqueuer _codegen;
   final Compiler compiler;
 
   String get name => 'Enqueue';
 
@@ skipping 65 matching lines @@
   bool isProcessed(Element member);
 
   Iterable<Entity> get processedEntities;
 
   Iterable<ClassElement> get processedClasses;
 }
 
 abstract class EnqueuerImpl extends Enqueuer {
   CompilerTask get task;
   EnqueuerStrategy get strategy;
-  void processInstantiatedClassMember(ClassElement cls, Element member);
+  void checkClass(ClassElement cls);
   void processStaticUse(StaticUse staticUse);
   void processTypeUse(TypeUse typeUse);
   void processDynamicUse(DynamicUse dynamicUse);
 }
 
 /// [Enqueuer] which is specific to resolution.
 class ResolutionEnqueuer extends EnqueuerImpl {
   static const ImpactUseCase IMPACT_USE =
       const ImpactUseCase('ResolutionEnqueuer');
 
   final CompilerTask task;
   final String name;
   final Resolution _resolution;
   final CompilerOptions _options;
   final Backend backend;
   final GlobalDependencyRegistry _globalDependencies;
   final CommonElements _commonElements;
   final native.NativeEnqueuer nativeEnqueuer;
 
   final EnqueuerStrategy strategy;
-  final Map<String, Set<Element>> _instanceMembersByName =
-      new Map<String, Set<Element>>();
-  final Map<String, Set<Element>> _instanceFunctionsByName =
-      new Map<String, Set<Element>>();
   final Set<ClassElement> _processedClasses = new Set<ClassElement>();
   Set<ClassElement> _recentClasses = new Setlet<ClassElement>();
   final ResolutionWorldBuilderImpl _universe;
 
   bool queueIsClosed = false;
 
   WorldImpactVisitor _impactVisitor;
 
   /// All declaration elements that have been processed by the resolver.
   final Set<AstElement> processedElements = new Set<AstElement>();
 
   final Queue<WorkItem> _queue = new Queue<WorkItem>();
 
   /// Queue of deferred resolution actions to execute when the resolution queue
   /// has been emptied.
   final Queue<_DeferredAction> _deferredQueue = new Queue<_DeferredAction>();
 
   ResolutionEnqueuer(
       this.task,
       this._options,
-      this._resolution,
+      Resolution resolution,
       this.strategy,
       this._globalDependencies,
       Backend backend,
-      CommonElements commonElements,
+      this._commonElements,
       CacheStrategy cacheStrategy,
       [this.name = 'resolution enqueuer'])
       : this.backend = backend,
-        this._commonElements = commonElements,
+        this._resolution = resolution,
         this.nativeEnqueuer = backend.nativeResolutionEnqueuer(),
         _universe = new ResolutionWorldBuilderImpl(
-            backend, commonElements, cacheStrategy, const TypeMaskStrategy()) {
+            backend, resolution, cacheStrategy, const TypeMaskStrategy()) {
     _impactVisitor = new EnqueuerImplImpactVisitor(this);
   }
 
   ResolutionWorldBuilder get universe => _universe;
 
   OpenWorld get _openWorld => universe.openWorld;
 
   bool get queueIsEmpty => _queue.isEmpty;
 
   DiagnosticReporter get _reporter => _resolution.reporter;
@@ skipping 34 matching lines @@
       if (!cls.isAbstract || isNative || mirrorUsage) {
         _processInstantiatedClass(cls);
       }
     });
   }
 
   bool checkNoEnqueuedInvokedInstanceMethods() {
     return strategy.checkEnqueuerConsistency(this);
   }
 
-  void processInstantiatedClassMember(ClassElement cls, Element member) {
-    assert(invariant(member, member.isDeclaration));
-    if (isProcessed(member)) return;
-    if (!member.isInstanceMember) return;
-    String memberName = member.name;
+  void checkClass(ClassElement cls) {
+    _processClassMembers(cls,
+        (MemberElement member, EnumSet<MemberUse> useSet) {
+      if (useSet.isNotEmpty) {
+        _reporter.internalError(member,
+            'Unenqueued use of $member: ${useSet.iterable(MemberUse.values)}');
+      }
+    });
+  }
 
-    if (member.isField) {
-      // The obvious thing to test here would be "member.isNative",
-      // however, that only works after metadata has been parsed/analyzed,
-      // and that may not have happened yet.
-      // So instead we use the enclosing class, which we know have had
-      // its metadata parsed and analyzed.
-      // Note: this assumes that there are no non-native fields on native
-      // classes, which may not be the case when a native class is subclassed.
-      if (backend.isNative(cls)) {
-        _openWorld.registerUsedElement(member);
-        if (_universe.hasInvokedGetter(member, _openWorld) ||
-            _universe.hasInvocation(member, _openWorld)) {
-          _addToWorkList(member);
-          return;
-        }
-        if (_universe.hasInvokedSetter(member, _openWorld)) {
-          _addToWorkList(member);
-          return;
-        }
-        // Native fields need to go into instanceMembersByName as they
-        // are virtual instantiation points and escape points.
-      } else {
-        // All field initializers must be resolved as they could
-        // have an observable side-effect (and cannot be tree-shaken
-        // away).
-        _addToWorkList(member);
-        return;
-      }
-    } else if (member.isFunction) {
-      FunctionElement function = member;
-      function.computeType(_resolution);
+  /// Callback for applying the first seen use of a [member].
+  void _applyFirstUse(MemberElement member, EnumSet<MemberUse> useSet) {
+    ClassElement cls = member.enclosingClass;
+    if (member.isFunction) {
+      MemberElement function = member;
       if (function.name == Identifiers.noSuchMethod_) {
         _registerNoSuchMethod(function);
       }
       if (function.name == Identifiers.call && !cls.typeVariables.isEmpty) {
         _registerCallMethodWithFreeTypeVariables(function);
       }
-      // If there is a property access with the same name as a method we
-      // need to emit the method.
-      if (_universe.hasInvokedGetter(function, _openWorld)) {
-        _registerClosurizedMember(function);
-        _addToWorkList(function);
-        return;
-      }
-      // Store the member in [instanceFunctionsByName] to catch
-      // getters on the function.
-      _instanceFunctionsByName
-          .putIfAbsent(memberName, () => new Set<Element>())
-          .add(member);
-      if (_universe.hasInvocation(function, _openWorld)) {
-        _addToWorkList(function);
-        return;
-      }
-    } else if (member.isGetter) {
-      FunctionElement getter = member;
-      getter.computeType(_resolution);
-      if (_universe.hasInvokedGetter(getter, _openWorld)) {
-        _addToWorkList(getter);
-        return;
-      }
-      // We don't know what selectors the returned closure accepts. If
-      // the set contains any selector we have to assume that it matches.
-      if (_universe.hasInvocation(getter, _openWorld)) {
-        _addToWorkList(getter);
-        return;
-      }
-    } else if (member.isSetter) {
-      FunctionElement setter = member;
-      setter.computeType(_resolution);
-      if (_universe.hasInvokedSetter(setter, _openWorld)) {
-        _addToWorkList(setter);
-        return;
-      }
     }
-
-    // The element is not yet used. Add it to the list of instance
-    // members to still be processed.
-    _instanceMembersByName
-        .putIfAbsent(memberName, () => new Set<Element>())
-        .add(member);
+    _applyUse(member, useSet);
   }
 
+  /// Callback for applying the use of a [member].
+  void _applyUse(Entity member, EnumSet<MemberUse> useSet) {
+    if (useSet.contains(MemberUse.NORMAL)) {
+      _addToWorkList(member);
+    }
+    if (useSet.contains(MemberUse.CLOSURIZE)) {
+      _registerClosurizedMember(member);
+    }
+  }
+
+  /// TODO(johnniwinther): Move this to [ResolutionWorldBuilderImpl].
   void _processInstantiatedClass(ClassElement cls) {
     task.measure(() {
       if (_processedClasses.contains(cls)) return;
       // The class must be resolved to compute the set of all
       // supertypes.
       cls.ensureResolved(_resolution);
 
       void processClass(ClassElement superclass) {
         if (_processedClasses.contains(superclass)) return;
 
         _processedClasses.add(superclass);
         _recentClasses.add(superclass);
         superclass.ensureResolved(_resolution);
-        superclass.implementation.forEachMember(processInstantiatedClassMember);
+        _processClassMembers(superclass, _applyFirstUse);
         _resolution.ensureClassMembers(superclass);
         // We only tell the backend once that [superclass] was instantiated, so
         // any additional dependencies must be treated as global
         // dependencies.
         applyImpact(
             backend.registerInstantiatedClass(superclass, forResolution: true));
       }
 
       ClassElement superclass = cls;
       while (superclass != null) {
         processClass(superclass);
         superclass = superclass.superclass;
       }
     });
   }
 
+  /// TODO(johnniwinther): Move this to [ResolutionWorldBuilderImpl].
+  void _processClassMembers(ClassElement cls, MemberUsed memberUsed) {
+    cls.implementation.forEachMember((ClassElement cls, MemberElement member) {
+      _universe.processInstantiatedClassMember(cls, member, memberUsed);
+    });
+  }
+
   void processDynamicUse(DynamicUse dynamicUse) {
     task.measure(() {
-      if (_universe.registerDynamicUse(dynamicUse)) {
-        _handleUnseenSelector(dynamicUse);
-      }
+      _universe.registerDynamicUse(dynamicUse, _applyUse);
     });
   }
 
-  void _processSet(
-      Map<String, Set<Element>> map, String memberName, bool f(Element e)) {
-    Set<Element> members = map[memberName];
-    if (members == null) return;
-    // [f] might add elements to [: map[memberName] :] during the loop below
-    // so we create a new list for [: map[memberName] :] and prepend the
-    // [remaining] members after the loop.
-    map[memberName] = new Set<Element>();
-    Set<Element> remaining = new Set<Element>();
-    for (Element member in members) {
-      if (!f(member)) remaining.add(member);
-    }
-    map[memberName].addAll(remaining);
-  }
-
-  void _processInstanceMembers(String n, bool f(Element e)) {
-    _processSet(_instanceMembersByName, n, f);
-  }
-
-  void _processInstanceFunctions(String n, bool f(Element e)) {
-    _processSet(_instanceFunctionsByName, n, f);
-  }
-
-  void _handleUnseenSelector(DynamicUse dynamicUse) {
-    Selector selector = dynamicUse.selector;
-    String methodName = selector.name;
-    _processInstanceMembers(methodName, (Element member) {
-      if (dynamicUse.appliesUnnamed(member, _openWorld)) {
-        if (member.isFunction && selector.isGetter) {
-          _registerClosurizedMember(member);
-        }
-        _addToWorkList(member);
-        return true;
-      }
-      return false;
-    });
-    if (selector.isGetter) {
-      _processInstanceFunctions(methodName, (Element member) {
-        if (dynamicUse.appliesUnnamed(member, _openWorld)) {
-          _registerClosurizedMember(member);
-          return true;
-        }
-        return false;
-      });
-    }
-  }
-
   void processStaticUse(StaticUse staticUse) {
     Element element = staticUse.element;
     assert(invariant(element, element.isDeclaration,
         message: "Element ${element} is not the declaration."));
     _universe.registerStaticUse(staticUse);
     applyImpact(backend.registerStaticUse(element, forResolution: true));
     bool addElement = true;
     switch (staticUse.kind) {
       case StaticUseKind.STATIC_TEAR_OFF:
         applyImpact(backend.registerGetOfStaticFunction());
@@ skipping 73 matching lines @@
     // against the type variable of a typedef.
     assert(!type.isTypeVariable || !type.element.enclosingElement.isTypedef);
   }
 
   void _registerCallMethodWithFreeTypeVariables(Element element) {
     applyImpact(backend.registerCallMethodWithFreeTypeVariables(element,
         forResolution: true));
     _universe.callMethodsWithFreeTypeVariables.add(element);
   }
 
-  void _registerClosurizedMember(TypedElement element) {
+  void _registerClosurizedMember(MemberElement element) {
     assert(element.isInstanceMember);
-    if (element.computeType(_resolution).containsTypeVariables) {
+    if (element.type.containsTypeVariables) {
       applyImpact(backend.registerClosureWithFreeTypeVariables(element,
           forResolution: true));
       _universe.closuresWithFreeTypeVariables.add(element);
     }
     applyImpact(backend.registerBoundClosure());
     _universe.closurizedMembers.add(element);
   }
 
   void forEach(void f(WorkItem work)) {
     do {
@@ skipping 134 matching lines @@
   void _emptyDeferredQueue() {
     while (!_deferredQueue.isEmpty) {
       _DeferredAction task = _deferredQueue.removeFirst();
       _reporter.withCurrentElement(task.element, task.action);
     }
   }
 
   void forgetElement(Element element, Compiler compiler) {
     _universe.forgetElement(element, compiler);
     _processedClasses.remove(element);
-    _instanceMembersByName[element.name]?.remove(element);
-    _instanceFunctionsByName[element.name]?.remove(element);
     processedElements.remove(element);
   }
 }
 
 void removeFromSet(Map<String, Set<Element>> map, Element element) {
   Set<Element> set = map[element.name];
   if (set == null) return;
   set.remove(element);
 }
 
@@ skipping 50 matching lines @@
 
   /// Check enqueuer consistency after the queue has been closed.
   bool checkEnqueuerConsistency(EnqueuerImpl enqueuer) {
     enqueuer.task.measure(() {
       // Run through the classes and see if we need to enqueue more methods.
       for (ClassElement classElement
           in enqueuer.universe.directlyInstantiatedClasses) {
         for (ClassElement currentClass = classElement;
             currentClass != null;
             currentClass = currentClass.superclass) {
-          currentClass.implementation
-              .forEachMember(enqueuer.processInstantiatedClassMember);
+          enqueuer.checkClass(currentClass);
         }
       }
     });
     return true;
   }
 }
 
 class EnqueuerImplImpactVisitor implements WorldImpactVisitor {
   final EnqueuerImpl enqueuer;
 
@@ skipping 16 matching lines @@
 }
 
 typedef void _DeferredActionFunction();
 
 class _DeferredAction {
   final Element element;
   final _DeferredActionFunction action;
 
   _DeferredAction(this.element, this.action);
 }