Elements. Consistently read ClassElement members.

With the changes to storing / reading of fragments and elements that I have in mind, not reading members significantly complicates the implementation.

Change-Id: I134b961f4e4d1515700e9d535ddb7742cb070fcf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392181
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -98,7 +98,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 = 405;
+  static const int DATA_VERSION = 407;
 
   /// 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

@@ -5086,11 +5086,6 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 
   @override
   List<PropertyAccessorElementImpl> get accessors {
-    if (!identical(_accessors, _Sentinel.propertyAccessorElement)) {
-      return _accessors;
-    }
-
-    linkedData?.readMembers(this);
     return _accessors;
   }
 
@@ -5120,11 +5115,6 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 
   @override
   List<FieldElementImpl> get fields {
-    if (!identical(_fields, _Sentinel.fieldElement)) {
-      return _fields;
-    }
-
-    linkedData?.readMembers(this);
     return _fields;
   }
 
@@ -5153,11 +5143,6 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 
   @override
   List<MethodElementImpl> get methods {
-    if (!identical(_methods, _Sentinel.methodElement)) {
-      return _methods;
-    }
-
-    linkedData?.readMembers(this);
     return _methods;
   }
 
@@ -5258,7 +5243,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
     }
 
     _buildMixinAppConstructors();
-    linkedData?.readMembers(this);
     return _constructors;
   }
 

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

@@ -74,7 +74,6 @@ class BundleReader {
       return _LibraryHeader(
         uri: uriCache.parse(_reader.readStringReference()),
         offset: _reader.readUInt30(),
-        classMembersLengths: _reader.readUInt30List(),
         macroGeneratedCode: _reader.readOptionalObject((reader) {
           return _reader.readStringUtf8();
         }),
@@ -93,7 +92,6 @@ class BundleReader {
         referenceReader: referenceReader,
         reference: reference,
         offset: libraryHeader.offset,
-        classMembersLengths: libraryHeader.classMembersLengths,
         infoDeclarationStore: _infoDeclarationStore,
         macroGeneratedCode: libraryHeader.macroGeneratedCode,
       );
@@ -103,8 +101,6 @@ class BundleReader {
 
 class ClassElementLinkedData extends ElementLinkedData<ClassElementImpl> {
   ApplyConstantOffsets? applyConstantOffsets;
-  void Function()? _readMembers;
-  void Function()? applyInformativeDataToMembers;
 
   ClassElementLinkedData({
     required Reference reference,
@@ -125,12 +121,6 @@ class ClassElementLinkedData extends ElementLinkedData<ClassElementImpl> {
 
     if (element.isMixinApplication) {
       element.constructors;
-    } else {
-      _readMembers?.call();
-      _readMembers = null;
-
-      applyInformativeDataToMembers?.call();
-      applyInformativeDataToMembers = null;
     }
   }
 
@@ -655,9 +645,6 @@ class LibraryReader {
   final InfoDeclarationStore _deserializedDataStore;
   final String? macroGeneratedCode;
 
-  final Uint32List _classMembersLengths;
-  int _classMembersLengthsIndex = 0;
-
   LibraryReader._({
     required LinkedElementFactory elementFactory,
     required SummaryDataReader reader,
@@ -667,7 +654,6 @@ class LibraryReader {
     required _ReferenceReader referenceReader,
     required Reference reference,
     required int offset,
-    required Uint32List classMembersLengths,
     required InfoDeclarationStore infoDeclarationStore,
     required this.macroGeneratedCode,
   })  : _elementFactory = elementFactory,
@@ -677,7 +663,6 @@ class LibraryReader {
         _referenceReader = referenceReader,
         _reference = reference,
         _offset = offset,
-        _classMembersLengths = classMembersLengths,
         _deserializedDataStore = infoDeclarationStore;
 
   LibraryElementImpl readElement({required Source librarySource}) {
@@ -686,11 +671,6 @@ class LibraryReader {
 
     _reader.offset = _offset;
 
-    // TODO(scheglov): https://github.com/dart-lang/sdk/issues/51855
-    // This should not be needed.
-    // But I have a suspicion that we attempt to read the library twice.
-    _classMembersLengthsIndex = 0;
-
     // Read enough data to create the library.
     var name = _reader.readStringReference();
     var featureSet = _readFeatureSet();
@@ -786,43 +766,21 @@ class LibraryReader {
     element.typeParameters = _readTypeParameters();
 
     if (!element.isMixinApplication) {
-      var membersOffset = _reader.offset;
-      linkedData._readMembers = () {
-        _reader.offset = membersOffset;
-        _readClassElementMembers(unitElement, element, reference);
-      };
-      if (_classMembersLengthsIndex >= _classMembersLengths.length) {
-        // TODO(scheglov): https://github.com/dart-lang/sdk/issues/51855
-        throw StateError(
-          '[libraryReference: $_reference]'
-          '[classReference: $reference]'
-          '[_classMembersLengthsIndex: $_classMembersLengthsIndex]'
-          '[_classMembersLengths: $_classMembersLengths]',
-        );
-      }
-      _reader.offset += _classMembersLengths[_classMembersLengthsIndex++];
+      var accessors = <PropertyAccessorElementImpl>[];
+      var fields = <FieldElementImpl>[];
+      _readFields(unitElement, element, reference, accessors, fields);
+      _readPropertyAccessors(
+          unitElement, element, reference, accessors, fields, '@field');
+      element.fields = fields.toFixedList();
+      element.accessors = accessors.toFixedList();
+
+      element.constructors = _readConstructors(unitElement, element, reference);
+      element.methods = _readMethods(unitElement, element, reference);
     }
 
     return element;
   }
 
-  void _readClassElementMembers(
-    CompilationUnitElementImpl unitElement,
-    ClassElementImpl element,
-    Reference reference,
-  ) {
-    var accessors = <PropertyAccessorElementImpl>[];
-    var fields = <FieldElementImpl>[];
-    _readFields(unitElement, element, reference, accessors, fields);
-    _readPropertyAccessors(
-        unitElement, element, reference, accessors, fields, '@field');
-    element.fields = fields.toFixedList();
-    element.accessors = accessors.toFixedList();
-
-    element.constructors = _readConstructors(unitElement, element, reference);
-    element.methods = _readMethods(unitElement, element, reference);
-  }
-
   void _readClasses(
     CompilationUnitElementImpl unitElement,
     Reference unitReference,
@@ -2721,18 +2679,12 @@ class _LibraryHeader {
   final Uri uri;
   final int offset;
 
-  /// We don't read class members when reading libraries, by performance
-  /// reasons - in many cases only some classes of a library are used. But
-  /// we need to know how much data to skip for each class.
-  final Uint32List classMembersLengths;
-
   /// The only (if any) macro generated augmentation code.
   final String? macroGeneratedCode;
 
   _LibraryHeader({
     required this.uri,
     required this.offset,
-    required this.classMembersLengths,
     required this.macroGeneratedCode,
   });
 }

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

@@ -54,11 +54,6 @@ class BundleWriter {
     references: _references,
   );
 
-  /// [_writeClassElement] remembers the length of data written into [_sink]
-  /// while writing members. So, when we read, we can skip members initially,
-  /// and read them later on demand.
-  List<int> _classMembersLengths = [];
-
   /// [_writePropertyAccessorElement] adds augmentations here, so that after
   /// reading the library we can read them, and while doing this, update
   /// `getter` and `setter` of augmented variables.
@@ -86,7 +81,6 @@ class BundleWriter {
     _sink.writeList<_Library>(_libraries, (library) {
       _sink._writeStringReference(library.uriStr);
       _sink.writeUInt30(library.offset);
-      _sink.writeUint30List(library.classMembersOffsets);
       _sink.writeOptionalObject(library.macroGenerated, (it) {
         _sink.writeStringUtf8(it.code);
       });
@@ -113,7 +107,6 @@ class BundleWriter {
 
   void writeLibraryElement(LibraryElementImpl libraryElement) {
     var libraryOffset = _sink.offset;
-    _classMembersLengths = [];
     _accessorAugmentations = [];
     _propertyAugmentations = [];
 
@@ -146,7 +139,6 @@ class BundleWriter {
       _Library(
         uriStr: '${libraryElement.source.uri}',
         offset: libraryOffset,
-        classMembersOffsets: _classMembersLengths,
         macroGenerated: macroGenerated,
       ),
     );
@@ -185,7 +177,6 @@ class BundleWriter {
       }
 
       if (!element.isMixinApplication) {
-        var membersOffset = _sink.offset;
         _writeList(
           element.fields.where((e) => !e.isSynthetic).toList(),
           _writeFieldElement,
@@ -196,7 +187,6 @@ class BundleWriter {
         );
         _writeList(element.constructors, _writeConstructorElement);
         _writeList(element.methods, _writeMethodElement);
-        _classMembersLengths.add(_sink.offset - membersOffset);
       }
     });
   }
@@ -1338,15 +1328,13 @@ class _BundleWriterReferences {
 class _Library {
   final String uriStr;
   final int offset;
-  final List<int> classMembersOffsets;
 
   /// The only (if any) macro generated fragment.
   final MacroGeneratedLibraryFragment? macroGenerated;
 
   _Library({
     required this.uriStr,
     required this.offset,
-    required this.classMembersOffsets,
     required this.macroGenerated,
   });
 }

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

@@ -225,6 +225,10 @@ class InformativeDataApplier {
       element.typeParameters_unresolved,
       info.typeParameters,
     );
+    _applyToConstructors(element.constructors, info.constructors);
+    _applyToFields(element.fields, info.fields);
+    _applyToAccessors(element.accessors, info.accessors);
+    _applyToMethods(element.methods, info.methods);
 
     var applyOffsets = ApplyConstantOffsets(
       info.constantOffsets,
@@ -234,20 +238,11 @@ class InformativeDataApplier {
       },
     );
 
-    void applyToMembers() {
-      _applyToConstructors(element.constructors, info.constructors);
-      _applyToFields(element.fields, info.fields);
-      _applyToAccessors(element.accessors, info.accessors);
-      _applyToMethods(element.methods, info.methods);
-    }
-
     var linkedData = element.linkedData;
     if (linkedData is ClassElementLinkedData) {
       linkedData.applyConstantOffsets = applyOffsets;
-      linkedData.applyInformativeDataToMembers = applyToMembers;
     } else {
       applyOffsets.perform();
-      applyToMembers();
     }
   }