Version 2.17.0-14.0.dev

Merge commit 'b5d627cccb3a5d5d9a093803f56b4da32caf861f' into 'dev'

Author: Dart CI

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

@@ -82,7 +82,7 @@ import 'package:meta/meta.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 197;
+  static const int DATA_VERSION = 199;
 
   /// 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

@@ -166,6 +166,20 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
     return null;
   }
 
+  @override
+  ConstructorElement? getNamedConstructor(String name) {
+    if (name == 'new') {
+      // A constructor declared as `C.new` is unnamed, and is modeled as such.
+      name = '';
+    }
+    for (ConstructorElement element in constructors) {
+      if (element.name == name) {
+        return element;
+      }
+    }
+    return null;
+  }
+
   @override
   PropertyAccessorElement? getSetter(String setterName) {
     return getSetterFromAccessors(setterName, accessors);
@@ -447,9 +461,6 @@ class ClassElementImpl extends AbstractClassElementImpl {
   /// This callback is set during mixins inference to handle reentrant calls.
   List<InterfaceType>? Function(ClassElementImpl)? mixinInferenceCallback;
 
-  /// TODO(scheglov) implement as modifier
-  bool _isSimplyBounded = true;
-
   ElementLinkedData? linkedData;
 
   /// Initialize a newly created class element to have the given [name] at the
@@ -661,15 +672,13 @@ class ClassElementImpl extends AbstractClassElementImpl {
     setModifier(Modifier.MIXIN_APPLICATION, isMixinApplication);
   }
 
-  /// TODO(scheglov) implement as modifier
   @override
   bool get isSimplyBounded {
-    return _isSimplyBounded;
+    return hasModifier(Modifier.SIMPLY_BOUNDED);
   }
 
-  /// TODO(scheglov) implement as modifier
   set isSimplyBounded(bool isSimplyBounded) {
-    _isSimplyBounded = isSimplyBounded;
+    setModifier(Modifier.SIMPLY_BOUNDED, isSimplyBounded);
   }
 
   @override
@@ -783,10 +792,6 @@ class ClassElementImpl extends AbstractClassElementImpl {
     builder.writeClassElement(this);
   }
 
-  @override
-  ConstructorElement? getNamedConstructor(String name) =>
-      getNamedConstructorFromList(name, constructors);
-
   void setLinkedData(Reference reference, ElementLinkedData linkedData) {
     this.reference = reference;
     reference.element = this;
@@ -948,20 +953,6 @@ class ClassElementImpl extends AbstractClassElementImpl {
       return implicitConstructor;
     }).toList(growable: false);
   }
-
-  static ConstructorElement? getNamedConstructorFromList(
-      String name, List<ConstructorElement> constructors) {
-    if (name == 'new') {
-      // A constructor declared as `C.new` is unnamed, and is modeled as such.
-      name = '';
-    }
-    for (ConstructorElement element in constructors) {
-      if (element.name == name) {
-        return element;
-      }
-    }
-    return null;
-  }
 }
 
 /// A concrete implementation of a [CompilationUnitElement].
@@ -2749,6 +2740,14 @@ class EnumElementImpl extends AbstractClassElementImpl {
     return _methods;
   }
 
+  /// Set the methods contained in this class to the given [methods].
+  set methods(List<MethodElement> methods) {
+    for (MethodElement method in methods) {
+      (method as MethodElementImpl).enclosingElement = this;
+    }
+    _methods = methods;
+  }
+
   @override
   List<InterfaceType> get mixins => const <InterfaceType>[];
 
@@ -2777,18 +2776,6 @@ class EnumElementImpl extends AbstractClassElementImpl {
     builder.writeEnumElement(this);
   }
 
-  /// Create the only method enums have - `toString()`.
-  void createToStringMethodElement() {
-    var method = MethodElementImpl('toString', -1);
-    method.isSynthetic = true;
-    method.enclosingElement = this;
-    method.reference = reference?.getChild('@method').getChild('toString');
-    _methods = <MethodElement>[method];
-  }
-
-  @override
-  ConstructorElement? getNamedConstructor(String name) => null;
-
   void setLinkedData(Reference reference, ElementLinkedData linkedData) {
     this.reference = reference;
     reference.element = this;
@@ -4332,14 +4319,17 @@ class Modifier implements Comparable<Modifier> {
   /// Indicates that the pseudo-modifier 'set' was applied to the element.
   static const Modifier SETTER = Modifier('SETTER', 19);
 
+  /// See [TypeParameterizedElement.isSimplyBounded].
+  static const Modifier SIMPLY_BOUNDED = Modifier('SIMPLY_BOUNDED', 20);
+
   /// Indicates that the modifier 'static' was applied to the element.
-  static const Modifier STATIC = Modifier('STATIC', 20);
+  static const Modifier STATIC = Modifier('STATIC', 21);
 
   /// Indicates that the element does not appear in the source code but was
   /// implicitly created. For example, if a class does not define any
   /// constructors, an implicit zero-argument constructor will be created and it
   /// will be marked as being synthetic.
-  static const Modifier SYNTHETIC = Modifier('SYNTHETIC', 21);
+  static const Modifier SYNTHETIC = Modifier('SYNTHETIC', 22);
 
   static const List<Modifier> values = [
     ABSTRACT,
@@ -4362,6 +4352,7 @@ class Modifier implements Comparable<Modifier> {
     MIXIN_APPLICATION,
     SETTER,
     STATIC,
+    SIMPLY_BOUNDED,
     SYNTHETIC
   ];
 
@@ -5445,10 +5436,6 @@ class TopLevelVariableElementImpl extends PropertyInducingElementImpl
 class TypeAliasElementImpl extends _ExistingElementImpl
     with TypeParameterizedElementMixin
     implements TypeAliasElement {
-  /// TODO(scheglov) implement as modifier
-  @override
-  bool isSimplyBounded = true;
-
   /// Is `true` if the element has direct or indirect reference to itself
   /// from anywhere except a class element or type parameter bounds.
   bool hasSelfReference = false;
@@ -5518,6 +5505,15 @@ class TypeAliasElementImpl extends _ExistingElementImpl
     return true;
   }
 
+  @override
+  bool get isSimplyBounded {
+    return hasModifier(Modifier.SIMPLY_BOUNDED);
+  }
+
+  set isSimplyBounded(bool isSimplyBounded) {
+    setModifier(Modifier.SIMPLY_BOUNDED, isSimplyBounded);
+  }
+
   @override
   ElementKind get kind {
     if (isNonFunctionTypeAliasesEnabled) {

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

@@ -50,9 +50,13 @@ class AstResolver {
     flowAnalysisHelper: _flowAnalysis,
   );
 
-  AstResolver(this._linker, this._unitElement, this._nameScope, AstNode node,
-      {this.enclosingClassElement, this.enclosingExecutableElement})
-      : _featureSet = node.thisOrAncestorOfType<CompilationUnit>()!.featureSet;
+  AstResolver(
+    this._linker,
+    this._unitElement,
+    this._nameScope, {
+    this.enclosingClassElement,
+    this.enclosingExecutableElement,
+  }) : _featureSet = _unitElement.library.featureSet;
 
   void resolveAnnotation(AnnotationImpl node) {
     node.accept(_resolutionVisitor);

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

@@ -272,23 +272,10 @@ class EnumElementLinkedData extends ElementLinkedData<EnumElementImpl> {
 
   @override
   void _read(element, reader) {
-    var typeProvider = element.library.typeProvider;
-
     element.metadata = reader._readAnnotationList(
       unitElement: element.enclosingElement,
     );
     _readTypeParameters(reader, element.typeParameters);
-
-    var indexField = element.getField('index') as FieldElementImpl;
-    indexField.type = typeProvider.intType;
-
-    var valuesField = element.getField('values') as ConstFieldElementImpl;
-    valuesField.constantInitializer = reader._readRequiredNode() as Expression;
-    valuesField.type = typeProvider.listType(element.thisType);
-
-    var toStringMethod = element.getMethod('toString') as MethodElementImpl;
-    toStringMethod.returnType = typeProvider.stringType;
-
     applyConstantOffsets?.perform();
   }
 }
@@ -612,44 +599,14 @@ class LibraryReader {
     var accessors = <PropertyAccessorElement>[];
     var fields = <FieldElement>[];
 
-    // Build the 'index' field.
-    {
-      var indexField = ConstFieldElementImpl('index', -1)
-        ..isFinal = true
-        ..isSynthetic = true;
-      indexField.bindReference(
-        reference.getChild('@field').getChild('index'),
-      );
-      indexField.createImplicitAccessors(reference, 'index');
-      fields.add(indexField);
-      accessors.add(indexField.getter!);
-    }
-
     _readFields(unitElement, element, reference, accessors, fields);
     _readPropertyAccessors(
         unitElement, element, reference, accessors, fields, '@field');
-
-    // Build the 'values' field.
-    {
-      var field = ConstFieldElementImpl('values', -1)
-        ..isConst = true
-        ..isStatic = true
-        ..isSynthetic = true;
-      fields.add(field);
-      accessors.add(
-        PropertyAccessorElementImpl_ImplicitGetter(field,
-            reference: reference.getChild('@getter').getChild('values'))
-          ..enclosingElement = element,
-      );
-    }
-
     element.fields = fields;
     element.accessors = accessors;
 
     element.constructors = _readConstructors(unitElement, element, reference);
-    // element.methods = _readMethods(unitElement, element, reference);
-
-    element.createToStringMethodElement();
+    element.methods = _readMethods(unitElement, element, reference);
 
     return element;
   }
@@ -884,6 +841,7 @@ class LibraryReader {
       offset: resolutionOffset,
     );
     element.setLinkedData(reference, linkedData);
+    MixinElementFlags.read(_reader, element);
 
     element.typeParameters = _readTypeParameters();
 

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

@@ -175,19 +175,18 @@ class BundleWriter {
     _resolutionSink._writeAnnotationList(element.metadata);
 
     _writeTypeParameters(element.typeParameters, () {
-      var valuesField = element.getField('values') as ConstFieldElementImpl;
-      _resolutionSink._writeNode(valuesField.constantInitializer!);
-
       _writeList(
-        element.fields.where((e) => !e.isSynthetic).toList(),
+        element.fields.where((e) {
+          return !e.isSynthetic || const {'index', 'values'}.contains(e.name);
+        }).toList(),
         _writeFieldElement,
       );
       _writeList(
         element.accessors.where((e) => !e.isSynthetic).toList(),
         _writePropertyAccessorElement,
       );
       _writeList(element.constructors, _writeConstructorElement);
-      // _writeList(element.methods, _writeMethodElement);
+      _writeList(element.methods, _writeMethodElement);
     });
   }
 
@@ -305,6 +304,7 @@ class BundleWriter {
     _sink.writeUInt30(_resolutionSink.offset);
 
     _sink._writeStringReference(element.name);
+    MixinElementFlags.write(_sink, element);
     _resolutionSink._writeAnnotationList(element.metadata);
 
     _writeTypeParameters(element.typeParameters, () {

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

@@ -46,7 +46,7 @@ class ConstructorInitializerResolver {
       element,
     );
 
-    var astResolver = AstResolver(_linker, unitElement, initializerScope, node,
+    var astResolver = AstResolver(_linker, unitElement, initializerScope,
         enclosingClassElement: classElement,
         enclosingExecutableElement: element);
 

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

@@ -74,7 +74,6 @@ class DefaultValueResolver {
       _linker,
       context.unitElement,
       context.scope,
-      node.defaultValue!,
       enclosingClassElement: context.classElement,
       enclosingExecutableElement: context.executableElement,
     );