Mostly use entities in use.dart

pkg/compiler/lib/src/universe/use.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.
 
 /// This library defines individual world impacts.
 ///
 /// We call these building blocks `uses`. Each `use` is a single impact of the
 /// world. Some example uses are:
 ///
 ///  * an invocation of a top level function
 ///  * a call to the `foo()` method on an unknown class.
 ///  * an instantiation of class T
 ///
 /// The different compiler stages combine these uses into `WorldImpact` objects,
 /// which are later used to construct a closed-world understanding of the
 /// program.
 library dart2js.universe.use;
 
 import '../closure.dart' show BoxFieldElement;
 import '../common.dart';
 import '../elements/types.dart';
-import '../elements/elements.dart';
+import '../elements/elements.dart'
+    show
+        ConstructorElement,
+        ConstructorBodyElement,
+        Element,
+        Entity,

[Siggi Cherem (dart-lang), 2017/01/18 19:27:53]

should we move Entity to entities.dart?

[Johnni Winther, 2017/01/19 12:20:57]

Soon-ish.

+        LocalFunctionElement;
+import '../elements/entities.dart';
 import '../util/util.dart' show Hashing;
 import '../world.dart' show World;
 import 'call_structure.dart' show CallStructure;
 import 'selector.dart' show Selector;
 import 'world_builder.dart' show ReceiverConstraint;
 
 enum DynamicUseKind {
   INVOKE,
   GET,
   SET,
 }
 
 /// The use of a dynamic property. [selector] defined the name and kind of the
 /// property and [mask] defines the known constraint for the object on which
 /// the property is accessed.
 class DynamicUse {
   final Selector selector;
   final ReceiverConstraint mask;
 
   DynamicUse(this.selector, this.mask);
 
-  bool appliesUnnamed(Element element, World world) {
+  bool appliesUnnamed(MemberEntity element, World world) {
     return selector.appliesUnnamed(element) &&
         (mask == null || mask.canHit(element, selector, world));
   }
 
   DynamicUseKind get kind {
     if (selector.isGetter) {
       return DynamicUseKind.GET;
     } else if (selector.isSetter) {
       return DynamicUseKind.SET;
     } else {
@@ skipping 24 matching lines @@
   CONST_CONSTRUCTOR_INVOKE,
   REDIRECTION,
   DIRECT_INVOKE,
   DIRECT_USE,
 }
 
 /// Statically known use of an [Element].
 // TODO(johnniwinther): Create backend-specific implementations with better
 // invariants.
 class StaticUse {
-  final Element element;
+  final Entity element;
   final StaticUseKind kind;
   final int hashCode;
   final DartType type;
 
-  StaticUse.internal(Element element, StaticUseKind kind,
-      [DartType type = null])
+  StaticUse.internal(Entity element, StaticUseKind kind, [DartType type = null])
       : this.element = element,
         this.kind = kind,
         this.type = type,
         this.hashCode = Hashing.objectsHash(element, kind, type) {
-    assert(invariant(element, element.isDeclaration,
+    assert(invariant(element, !(element is Element && !element.isDeclaration),
         message: "Static use element $element must be "
             "the declaration element."));
   }
 
   /// Invocation of a static or top-level [element] with the given
   /// [callStructure].
   factory StaticUse.staticInvoke(
-      MethodElement element, CallStructure callStructure) {
+      FunctionEntity element, CallStructure callStructure) {
     // TODO(johnniwinther): Use the [callStructure].
     assert(invariant(element, element.isStatic || element.isTopLevel,
         message: "Static invoke element $element must be a top-level "
             "or static method."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Closurization of a static or top-level function [element].
-  factory StaticUse.staticTearOff(MethodElement element) {
+  factory StaticUse.staticTearOff(FunctionEntity element) {
     assert(invariant(element, element.isStatic || element.isTopLevel,
         message: "Static tear-off element $element must be a top-level "
             "or static method."));
     return new StaticUse.internal(element, StaticUseKind.STATIC_TEAR_OFF);
   }
 
   /// Read access of a static or top-level field or getter [element].
-  factory StaticUse.staticGet(MemberElement element) {
+  factory StaticUse.staticGet(MemberEntity element) {
     assert(invariant(element, element.isStatic || element.isTopLevel,
         message: "Static get element $element must be a top-level "
             "or static method."));
     assert(invariant(element, element.isField || element.isGetter,
         message: "Static get element $element must be a field or a getter."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Write access of a static or top-level field or setter [element].
-  factory StaticUse.staticSet(MemberElement element) {
+  factory StaticUse.staticSet(MemberEntity element) {
     assert(invariant(element, element.isStatic || element.isTopLevel,
         message: "Static set element $element must be a top-level "
             "or static method."));
     assert(invariant(element, element.isField || element.isSetter,
         message: "Static set element $element must be a field or a setter."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Invocation of the lazy initializer for a static or top-level field
   /// [element].
-  factory StaticUse.staticInit(FieldElement element) {
+  factory StaticUse.staticInit(FieldEntity element) {
     assert(invariant(element, element.isStatic || element.isTopLevel,
         message: "Static init element $element must be a top-level "
             "or static method."));
     assert(invariant(element, element.isField,
         message: "Static init element $element must be a field."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Invocation of a super method [element] with the given [callStructure].
   factory StaticUse.superInvoke(
-      MethodElement element, CallStructure callStructure) {
+      FunctionEntity element, CallStructure callStructure) {
     // TODO(johnniwinther): Use the [callStructure].
     assert(invariant(element, element.isInstanceMember,
         message: "Super invoke element $element must be an instance method."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Read access of a super field or getter [element].
-  factory StaticUse.superGet(MemberElement element) {
+  factory StaticUse.superGet(MemberEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Super get element $element must be an instance method."));
     assert(invariant(element, element.isField || element.isGetter,
         message: "Super get element $element must be a field or a getter."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Write access of a super field [element].
-  factory StaticUse.superFieldSet(FieldElement element) {
+  factory StaticUse.superFieldSet(FieldEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Super set element $element must be an instance method."));
     assert(invariant(element, element.isField,
         message: "Super set element $element must be a field."));
     return new StaticUse.internal(element, StaticUseKind.SUPER_FIELD_SET);
   }
 
   /// Write access of a super setter [element].
-  factory StaticUse.superSetterSet(SetterElement element) {
+  factory StaticUse.superSetterSet(FunctionEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Super set element $element must be an instance method."));
     assert(invariant(element, element.isSetter,
         message: "Super set element $element must be a setter."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Closurization of a super method [element].
-  factory StaticUse.superTearOff(MethodElement element) {
+  factory StaticUse.superTearOff(FunctionEntity element) {
     assert(invariant(element, element.isInstanceMember && element.isFunction,
         message: "Super invoke element $element must be an instance method."));
     return new StaticUse.internal(element, StaticUseKind.SUPER_TEAR_OFF);
   }
 
   /// Invocation of a constructor [element] through a this or super
   /// constructor call with the given [callStructure].
   factory StaticUse.superConstructorInvoke(
-      Element element, CallStructure callStructure) {
+      ConstructorElement element, CallStructure callStructure) {
     // TODO(johnniwinther): Use the [callStructure].
     assert(invariant(element, element.isGenerativeConstructor,
         message: "Constructor invoke element $element must be a "
             "generative constructor."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Invocation of a constructor (body) [element] through a this or super
   /// constructor call with the given [callStructure].
   factory StaticUse.constructorBodyInvoke(
       ConstructorBodyElement element, CallStructure callStructure) {
     // TODO(johnniwinther): Use the [callStructure].
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Direct invocation of a method [element] with the given [callStructure].
   factory StaticUse.directInvoke(
-      MethodElement element, CallStructure callStructure) {
+      FunctionEntity element, CallStructure callStructure) {
     // TODO(johnniwinther): Use the [callStructure].
     assert(invariant(element, element.isInstanceMember,
         message: "Direct invoke element $element must be an instance member."));
     assert(invariant(element, element.isFunction,
         message: "Direct invoke element $element must be a method."));
     return new StaticUse.internal(element, StaticUseKind.DIRECT_INVOKE);
   }
 
   /// Direct read access of a field or getter [element].
-  factory StaticUse.directGet(MemberElement element) {
+  factory StaticUse.directGet(MemberEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Direct get element $element must be an instance member."));
     assert(invariant(element, element.isField || element.isGetter,
         message: "Direct get element $element must be a field or a getter."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Direct write access of a field [element].
-  factory StaticUse.directSet(FieldElement element) {
+  factory StaticUse.directSet(FieldEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Direct set element $element must be an instance member."));
     assert(invariant(element, element.isField,
         message: "Direct set element $element must be a field."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Constructor invocation of [element] with the given [callStructure].
   factory StaticUse.constructorInvoke(
-      ConstructorElement element, CallStructure callStructure) {
+      FunctionEntity element, CallStructure callStructure) {
+    assert(invariant(element, element.isConstructor,
+        message: "Constructor invocation element $element "
+            "must be a constructor."));
     // TODO(johnniwinther): Use the [callStructure].
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Constructor invocation of [element] with the given [callStructure] on
   /// [type].
   factory StaticUse.typedConstructorInvoke(
-      ConstructorElement element, CallStructure callStructure, DartType type) {
+      FunctionEntity element, CallStructure callStructure, DartType type) {
     assert(invariant(element, type != null,
         message: "No type provided for constructor invocation."));
+    assert(invariant(element, element.isConstructor,
+        message: "Typed constructor invocation element $element "
+            "must be a constructor."));
     // TODO(johnniwinther): Use the [callStructure].
     return new StaticUse.internal(
         element, StaticUseKind.CONSTRUCTOR_INVOKE, type);
   }
 
   /// Constant constructor invocation of [element] with the given
   /// [callStructure] on [type].
   factory StaticUse.constConstructorInvoke(
-      ConstructorElement element, CallStructure callStructure, DartType type) {
+      FunctionEntity element, CallStructure callStructure, DartType type) {
     assert(invariant(element, type != null,
         message: "No type provided for constructor invocation."));
+    assert(invariant(element, element.isConstructor,
+        message: "Const constructor invocation element $element "
+            "must be a constructor."));
     // TODO(johnniwinther): Use the [callStructure].
     return new StaticUse.internal(
         element, StaticUseKind.CONST_CONSTRUCTOR_INVOKE, type);
   }
 
   /// Constructor redirection to [element] on [type].
   factory StaticUse.constructorRedirect(
-      ConstructorElement element, InterfaceType type) {
+      FunctionEntity element, InterfaceType type) {
     assert(invariant(element, type != null,
-        message: "No type provided for constructor invocation."));
+        message: "No type provided for constructor redirection."));
+    assert(invariant(element, element.isConstructor,
+        message: "Constructor redirection element $element "
+            "must be a constructor."));
     return new StaticUse.internal(element, StaticUseKind.REDIRECTION, type);
   }
 
   /// Initialization of an instance field [element].
-  factory StaticUse.fieldInit(FieldElement element) {
+  factory StaticUse.fieldInit(FieldEntity element) {
     assert(invariant(element, element.isInstanceMember,
         message: "Field init element $element must be an instance field."));
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Read access of an instance field or boxed field [element].
-  factory StaticUse.fieldGet(FieldElement element) {
+  factory StaticUse.fieldGet(FieldEntity element) {
     assert(invariant(
         element, element.isInstanceMember || element is BoxFieldElement,
         message: "Field init element $element must be an instance "
             "or boxed field."));
     return new StaticUse.internal(element, StaticUseKind.FIELD_GET);
   }
 
   /// Write access of an instance field or boxed field [element].
-  factory StaticUse.fieldSet(FieldElement element) {
+  factory StaticUse.fieldSet(FieldEntity element) {
     assert(invariant(
         element, element.isInstanceMember || element is BoxFieldElement,
         message: "Field init element $element must be an instance "
             "or boxed field."));
     return new StaticUse.internal(element, StaticUseKind.FIELD_SET);
   }
 
   /// Read of a local function [element].
   factory StaticUse.closure(LocalFunctionElement element) {
     return new StaticUse.internal(element, StaticUseKind.CLOSURE);
   }
 
   /// Unknown use of [element].
   @deprecated
-  factory StaticUse.foreignUse(Element element) {
+  factory StaticUse.foreignUse(Entity element) {
     return new StaticUse.internal(element, StaticUseKind.GENERAL);
   }
 
   /// Direct use of [element] as done with `--analyze-all` and `--analyze-main`.
-  factory StaticUse.directUse(Element element) {
+  factory StaticUse.directUse(Entity element) {
     return new StaticUse.internal(element, StaticUseKind.DIRECT_USE);
   }
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! StaticUse) return false;
     return element == other.element && kind == other.kind && type == other.type;
   }
 
   String toString() => 'StaticUse($element,$kind,$type)';
@@ skipping 62 matching lines @@
   }
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! TypeUse) return false;
     return type == other.type && kind == other.kind;
   }
 
   String toString() => 'TypeUse($type,$kind)';
 }