Add hasEnclosingTypeParameterReference flag.

I plan using this flag to avoid wrapping ExecutableElementImpl of a generic InterfaceElement into ExecutableMember. Currently we have a shortcut to avoid this was non-generic inherited methods, but still wrap anything from a generic, because we don't know whether we need type substitutions.

Change-Id: I554cdbbc32dc90b8591f9956eebd9fc4c1e9c1c0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420842
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -100,7 +100,7 @@ import 'package:meta/meta.dart';
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 451;
+  static const int DATA_VERSION = 452;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/element/element.dart

@@ -3638,6 +3638,14 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
   /// The type of function defined by this executable element.
   FunctionTypeImpl? _type;
 
+  /// Whether the type of this fragment references a type parameter of the
+  /// enclosing element. This includes not only explicitly specified type
+  /// annotations, but also inferred types.
+  ///
+  /// Top-level declarations don't have enclosing element type parameters,
+  /// so for them this flag is always `false`.
+  bool hasEnclosingTypeParameterReference = true;
+
   @override
   ElementLinkedData? linkedData;
 
@@ -3844,6 +3852,17 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
         ...formalParameters,
       ];
 
+  /// Whether the type of this element references a type parameter of the
+  /// enclosing element. This includes not only explicitly specified type
+  /// annotations, but also inferred types.
+  ///
+  /// Top-level declarations don't have enclosing element type parameters,
+  /// so for them this flag is always `false`.
+  bool get hasEnclosingTypeParameterReference {
+    var firstFragment = this.firstFragment as ExecutableElementImpl;
+    return firstFragment.hasEnclosingTypeParameterReference;
+  }
+
   bool get invokesSuperSelf {
     var firstFragment = this.firstFragment as ExecutableElementImpl;
     return firstFragment.hasModifier(Modifier.INVOKES_SUPER_SELF);
@@ -4195,6 +4214,11 @@ class FieldElementImpl extends PropertyInducingElementImpl
   /// when it overrides a field in a supertype that is covariant.
   bool inheritsCovariant = false;
 
+  /// Whether the type of this fragment references a type parameter of the
+  /// enclosing element. This includes not only explicitly specified type
+  /// annotations, but also inferred types.
+  bool hasEnclosingTypeParameterReference = true;
+
   /// The element corresponding to this fragment.
   FieldElementImpl2? _element;
 
@@ -4339,6 +4363,13 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
   @override
   GetterElementImpl? get getter2 => firstFragment.getter?.element;
 
+  /// Whether the type of this fragment references a type parameter of the
+  /// enclosing element. This includes not only explicitly specified type
+  /// annotations, but also inferred types.
+  bool get hasEnclosingTypeParameterReference {
+    return firstFragment.hasEnclosingTypeParameterReference;
+  }
+
   @override
   bool get hasImplicitType => firstFragment.hasImplicitType;
 
@@ -4354,6 +4385,10 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
   @override
   bool get isEnumConstant => firstFragment.isEnumConstant;
 
+  bool get isEnumValues {
+    return enclosingElement2 is EnumElementImpl2 && name3 == 'values';
+  }
+
   @override
   bool get isExternal => firstFragment.isExternal;
 

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -1108,10 +1108,14 @@ class LibraryReader {
 
     if (!element.isAugmentation) {
       if (getterReference != null) {
-        element.createImplicitGetter(getterReference);
+        var getter = element.createImplicitGetter(getterReference);
+        getter.hasEnclosingTypeParameterReference =
+            element.hasEnclosingTypeParameterReference;
       }
       if (element.hasSetter && setterReference != null) {
-        element.createImplicitSetter(setterReference);
+        var setter = element.createImplicitSetter(setterReference);
+        setter.hasEnclosingTypeParameterReference =
+            element.hasEnclosingTypeParameterReference;
       }
     }
 
@@ -1581,7 +1585,9 @@ class LibraryReader {
             ..name2 = accessor.name2
             ..isStatic = accessor.isStatic
             ..isSynthetic = true
-            ..isPromotable = isPromotable;
+            ..isPromotable = isPromotable
+            ..hasEnclosingTypeParameterReference =
+                accessor.hasEnclosingTypeParameterReference;
           propertyFragmentReference.element ??= propertyFragment;
           propertyFragments.add(propertyFragment);
         }
@@ -1662,10 +1668,12 @@ class LibraryReader {
     fragment.typeInferenceError = _readTopLevelInferenceError();
 
     if (getterReference != null) {
-      fragment.createImplicitGetter(getterReference);
+      var getter = fragment.createImplicitGetter(getterReference);
+      getter.hasEnclosingTypeParameterReference = false;
     }
     if (fragment.hasSetter && setterReference != null) {
-      fragment.createImplicitSetter(setterReference);
+      var getter = fragment.createImplicitSetter(setterReference);
+      getter.hasEnclosingTypeParameterReference = false;
     }
 
     return fragment;

pkg/analyzer/lib/src/summary2/element_builder.dart

@@ -410,6 +410,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
     // Build the 'values' field.
     var valuesField = ConstFieldElementImpl('values', -1)
+      ..hasEnclosingTypeParameterReference = false
       ..isConst = true
       ..isStatic = true
       ..isSynthetic = true

pkg/analyzer/lib/src/summary2/element_flags.dart

@@ -55,14 +55,17 @@ class ClassElementFlags {
 }
 
 class ConstructorElementFlags {
-  static const int _isAugmentation = 1 << 0;
-  static const int _isConst = 1 << 1;
-  static const int _isExternal = 1 << 2;
-  static const int _isFactory = 1 << 3;
-  static const int _isSynthetic = 1 << 4;
+  static const int _hasEnclosingTypeParameterReference = 1 << 0;
+  static const int _isAugmentation = 1 << 1;
+  static const int _isConst = 1 << 2;
+  static const int _isExternal = 1 << 3;
+  static const int _isFactory = 1 << 4;
+  static const int _isSynthetic = 1 << 5;
 
   static void read(SummaryDataReader reader, ConstructorElementImpl element) {
     var byte = reader.readByte();
+    element.hasEnclosingTypeParameterReference =
+        (byte & _hasEnclosingTypeParameterReference) != 0;
     element.isAugmentation = (byte & _isAugmentation) != 0;
     element.isConst = (byte & _isConst) != 0;
     element.isExternal = (byte & _isExternal) != 0;
@@ -72,6 +75,9 @@ class ConstructorElementFlags {
 
   static void write(BufferedSink sink, ConstructorElementImpl element) {
     var result = 0;
+    result |= element.hasEnclosingTypeParameterReference
+        ? _hasEnclosingTypeParameterReference
+        : 0;
     result |= element.isAugmentation ? _isAugmentation : 0;
     result |= element.isConst ? _isConst : 0;
     result |= element.isExternal ? _isExternal : 0;
@@ -150,24 +156,27 @@ class ExtensionTypeElementFlags {
 }
 
 class FieldElementFlags {
-  static const int _hasImplicitType = 1 << 0;
-  static const int _hasInitializer = 1 << 1;
-  static const int _inheritsCovariant = 1 << 2;
-  static const int _isAbstract = 1 << 3;
-  static const int _isAugmentation = 1 << 4;
-  static const int _isConst = 1 << 5;
-  static const int _isCovariant = 1 << 6;
-  static const int _isEnumConstant = 1 << 7;
-  static const int _isExternal = 1 << 8;
-  static const int _isFinal = 1 << 9;
-  static const int _isLate = 1 << 10;
-  static const int _isPromotable = 1 << 11;
-  static const int _shouldUseTypeForInitializerInference = 1 << 12;
-  static const int _isStatic = 1 << 13;
-  static const int _isSynthetic = 1 << 14;
+  static const int _hasEnclosingTypeParameterReference = 1 << 0;
+  static const int _hasImplicitType = 1 << 1;
+  static const int _hasInitializer = 1 << 2;
+  static const int _inheritsCovariant = 1 << 3;
+  static const int _isAbstract = 1 << 4;
+  static const int _isAugmentation = 1 << 5;
+  static const int _isConst = 1 << 6;
+  static const int _isCovariant = 1 << 7;
+  static const int _isEnumConstant = 1 << 8;
+  static const int _isExternal = 1 << 9;
+  static const int _isFinal = 1 << 10;
+  static const int _isLate = 1 << 11;
+  static const int _isPromotable = 1 << 12;
+  static const int _shouldUseTypeForInitializerInference = 1 << 13;
+  static const int _isStatic = 1 << 14;
+  static const int _isSynthetic = 1 << 15;
 
   static void read(SummaryDataReader reader, FieldElementImpl element) {
     var byte = reader.readUInt30();
+    element.hasEnclosingTypeParameterReference =
+        (byte & _hasEnclosingTypeParameterReference) != 0;
     element.hasImplicitType = (byte & _hasImplicitType) != 0;
     element.hasInitializer = (byte & _hasInitializer) != 0;
     element.inheritsCovariant = (byte & _inheritsCovariant) != 0;
@@ -188,6 +197,9 @@ class FieldElementFlags {
 
   static void write(BufferedSink sink, FieldElementImpl element) {
     var result = 0;
+    result |= element.hasEnclosingTypeParameterReference
+        ? _hasEnclosingTypeParameterReference
+        : 0;
     result |= element.hasImplicitType ? _hasImplicitType : 0;
     result |= element.hasInitializer ? _hasInitializer : 0;
     result |= element.inheritsCovariant ? _inheritsCovariant : 0;
@@ -275,19 +287,22 @@ class LibraryImportElementFlags {
 
 class MethodElementFlags {
   static const int _hasImplicitReturnType = 1 << 0;
-  static const int _invokesSuperSelf = 1 << 1;
-  static const int _isAbstract = 1 << 2;
-  static const int _isAsynchronous = 1 << 3;
-  static const int _isAugmentation = 1 << 4;
-  static const int _isExtensionTypeMember = 1 << 5;
-  static const int _isExternal = 1 << 6;
-  static const int _isGenerator = 1 << 7;
-  static const int _isStatic = 1 << 8;
-  static const int _isSynthetic = 1 << 9;
+  static const int _hasEnclosingTypeParameterReference = 1 << 1;
+  static const int _invokesSuperSelf = 1 << 2;
+  static const int _isAbstract = 1 << 3;
+  static const int _isAsynchronous = 1 << 4;
+  static const int _isAugmentation = 1 << 5;
+  static const int _isExtensionTypeMember = 1 << 6;
+  static const int _isExternal = 1 << 7;
+  static const int _isGenerator = 1 << 8;
+  static const int _isStatic = 1 << 9;
+  static const int _isSynthetic = 1 << 10;
 
   static void read(SummaryDataReader reader, MethodElementImpl element) {
     var bits = reader.readUInt30();
     element.hasImplicitReturnType = (bits & _hasImplicitReturnType) != 0;
+    element.hasEnclosingTypeParameterReference =
+        (bits & _hasEnclosingTypeParameterReference) != 0;
     element.invokesSuperSelf = (bits & _invokesSuperSelf) != 0;
     element.isAbstract = (bits & _isAbstract) != 0;
     element.isAsynchronous = (bits & _isAsynchronous) != 0;
@@ -302,6 +317,9 @@ class MethodElementFlags {
   static void write(BufferedSink sink, MethodElementImpl element) {
     var result = 0;
     result |= element.hasImplicitReturnType ? _hasImplicitReturnType : 0;
+    result |= element.hasEnclosingTypeParameterReference
+        ? _hasEnclosingTypeParameterReference
+        : 0;
     result |= element.invokesSuperSelf ? _invokesSuperSelf : 0;
     result |= element.isAbstract ? _isAbstract : 0;
     result |= element.isAsynchronous ? _isAsynchronous : 0;
@@ -364,17 +382,18 @@ class ParameterElementFlags {
 }
 
 class PropertyAccessorElementFlags {
-  static const int _invokesSuperSelf = 1 << 0;
-  static const int _isAugmentation = 1 << 1;
-  static const int _isGetter = 1 << 2;
-  static const int _isSetter = 1 << 3;
-  static const int _hasImplicitReturnType = 1 << 4;
-  static const int _isAbstract = 1 << 5;
-  static const int _isAsynchronous = 1 << 6;
-  static const int _isExtensionTypeMember = 1 << 7;
-  static const int _isExternal = 1 << 8;
-  static const int _isGenerator = 1 << 9;
-  static const int _isStatic = 1 << 10;
+  static const int _hasEnclosingTypeParameterReference = 1 << 0;
+  static const int _invokesSuperSelf = 1 << 1;
+  static const int _isAugmentation = 1 << 2;
+  static const int _isGetter = 1 << 3;
+  static const int _isSetter = 1 << 4;
+  static const int _hasImplicitReturnType = 1 << 5;
+  static const int _isAbstract = 1 << 6;
+  static const int _isAsynchronous = 1 << 7;
+  static const int _isExtensionTypeMember = 1 << 8;
+  static const int _isExternal = 1 << 9;
+  static const int _isGenerator = 1 << 10;
+  static const int _isStatic = 1 << 11;
 
   static bool isGetter(int flags) => (flags & _isGetter) != 0;
 
@@ -388,6 +407,8 @@ class PropertyAccessorElementFlags {
 
   static void setFlagsBasedOnFlagByte(
       PropertyAccessorElementImpl element, int byte) {
+    element.hasEnclosingTypeParameterReference =
+        (byte & _hasEnclosingTypeParameterReference) != 0;
     element.invokesSuperSelf = (byte & _invokesSuperSelf) != 0;
     element.isAugmentation = (byte & _isAugmentation) != 0;
     element.hasImplicitReturnType = (byte & _hasImplicitReturnType) != 0;
@@ -401,6 +422,9 @@ class PropertyAccessorElementFlags {
 
   static void write(BufferedSink sink, PropertyAccessorElementImpl element) {
     var result = 0;
+    result |= element.hasEnclosingTypeParameterReference
+        ? _hasEnclosingTypeParameterReference
+        : 0;
     result |= element.invokesSuperSelf ? _invokesSuperSelf : 0;
     result |= element.isAugmentation ? _isAugmentation : 0;
     result |= element.isGetter ? _isGetter : 0;