Add StaticUse for more precise registration of statically known element use.

pkg/compiler/lib/src/universe/universe.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 universe;
 
 import 'dart:collection';
 
 import '../common.dart';
 import '../compiler.dart' show
     Compiler;
 import '../elements/elements.dart';
 import '../dart_types.dart';
 import '../util/util.dart';
 import '../world.dart' show
     ClassWorld,
     World;
 
 import 'selector.dart' show
     Selector;
+import 'use.dart' show
+    StaticUse,
+    StaticUseKind;
 
+enum DynamicUseKind {
+  INVOKE,
+  GET,
+  SET,
+}
+
+// TODO(johnniwinther): Rename to `DynamicUse` and move to 'use.dart'.
 class UniverseSelector {
   final Selector selector;
   final ReceiverConstraint mask;
 
   UniverseSelector(this.selector, this.mask);
 
   bool appliesUnnamed(Element element, ClassWorld world) {
     return selector.appliesUnnamed(element, world) &&
         (mask == null || mask.canHit(element, selector, world));
   }
 
+  DynamicUseKind get kind {
+    if (selector.isGetter) {
+      return DynamicUseKind.GET;
+    } else if (selector.isSetter) {
+      return DynamicUseKind.SET;
+    } else {
+      return DynamicUseKind.INVOKE;
+    }
+  }
+
   int get hashCode => selector.hashCode * 13 + mask.hashCode * 17;
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! UniverseSelector) return false;
     return selector == other.selector && mask == other.mask;
   }
 
   String toString() => '$selector,$mask';
 }
@@ skipping 273 matching lines @@
   }
 
   bool hasInvokedGetter(Element member, World world) {
     return _hasMatchingSelector(_invokedGetters[member.name], member, world);
   }
 
   bool hasInvokedSetter(Element member, World world) {
     return _hasMatchingSelector(_invokedSetters[member.name], member, world);
   }
 
-  bool registerInvocation(UniverseSelector selector) {
-    return _registerNewSelector(selector, _invokedNames);
-  }
-
-  bool registerInvokedGetter(UniverseSelector selector) {
-    return _registerNewSelector(selector, _invokedGetters);
-  }
-
-  bool registerInvokedSetter(UniverseSelector selector) {
-    return _registerNewSelector(selector, _invokedSetters);
+  bool registerDynamicUse(UniverseSelector selector) {
+    switch (selector.kind) {
+      case DynamicUseKind.INVOKE:
+        return _registerNewSelector(selector, _invokedNames);
+      case DynamicUseKind.GET:
+        return _registerNewSelector(selector, _invokedGetters);
+      case DynamicUseKind.SET:
+        return _registerNewSelector(selector, _invokedSetters);
+    }
   }
 
   bool _registerNewSelector(
       UniverseSelector universeSelector,
       Map<String, Map<Selector, SelectorConstraints>> selectorMap) {
     Selector selector = universeSelector.selector;
     String name = selector.name;
     ReceiverConstraint mask = universeSelector.mask;
     Map<Selector, SelectorConstraints> selectors = selectorMap.putIfAbsent(
         name, () => new Maplet<Selector, SelectorConstraints>());
@@ skipping 38 matching lines @@
   DartType registerIsCheck(DartType type, Compiler compiler) {
     type.computeUnaliased(compiler.resolution);
     type = type.unaliased;
     // 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.
     isChecks.add(type);
     return type;
   }
 
-  void registerStaticFieldUse(FieldElement staticField) {
-    assert(Elements.isStaticOrTopLevel(staticField) && staticField.isField);
-    assert(staticField.isDeclaration);
-
-    allReferencedStaticFields.add(staticField);
+  void registerStaticUse(StaticUse staticUse) {
+    Element element = staticUse.element;
+    if (Elements.isStaticOrTopLevel(element) && element.isField) {
+      allReferencedStaticFields.add(element);
+    }
+    switch (staticUse.kind) {
+      case StaticUseKind.STATIC_TEAR_OFF:
+        staticFunctionsNeedingGetter.add(element);
+        break;
+      case StaticUseKind.FIELD_GET:
+        fieldGetters.add(element);
+        break;
+      case StaticUseKind.FIELD_SET:
+        fieldSetters.add(element);
+        break;
+      case StaticUseKind.SUPER_TEAR_OFF:
+        methodsNeedingSuperGetter.add(element);
+        break;
+      case StaticUseKind.GENERAL:
+        break;
+    }
   }
 
   void forgetElement(Element element, Compiler compiler) {
     allClosures.remove(element);
     slowDirectlyNestedClosures(element).forEach(compiler.forgetElement);
     closurizedMembers.remove(element);
     fieldSetters.remove(element);
     fieldGetters.remove(element);
     _directlyInstantiatedClasses.remove(element);
     _allInstantiatedClasses.remove(element);
@@ skipping 10 matching lines @@
   // TODO(ahe): Replace this method with something that is O(1), for example,
   // by using a map.
   List<LocalFunctionElement> slowDirectlyNestedClosures(Element element) {
     // Return new list to guard against concurrent modifications.
     return new List<LocalFunctionElement>.from(
         allClosures.where((LocalFunctionElement closure) {
           return closure.executableContext == element;
         }));
   }
 }