Elements. Remove augmentation properties/accessors relinking information.

We now write and read library fragments in the correct order, so
declarations are always read before augmentations.

Change-Id: I5a35cf8d963c3a5010344361289d3be4dc5b7f11
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392620
Reviewed-by: Phil Quitslund <[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 = 408;
+  static const int DATA_VERSION = 409;
 
   /// 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/summary2/bundle_reader.dart

@@ -683,8 +683,6 @@ class LibraryReader {
     );
 
     var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
-    var accessorAugmentationsOffset = _reader.readUInt30();
-
     libraryElement.linkedData = LibraryElementLinkedData(
       reference: _reference,
       libraryReader: this,
@@ -698,8 +696,6 @@ class LibraryReader {
             _elementFactory, _unitsInformativeBytes, _deserializedDataStore)
         .applyTo(libraryElement);
 
-    _readPropertyAccessorAugmentations(accessorAugmentationsOffset);
-
     return libraryElement;
   }
 
@@ -1528,29 +1524,6 @@ class LibraryReader {
     );
   }
 
-  /// This method is invoked when all units of the library are read, the
-  /// defining unit, and all its augmentations. So, we have all elements
-  /// created (excluding class members, that are delayed).
-  ///
-  /// We can read now augmentation back and forth pointers, for accessors and
-  /// properties.
-  void _readPropertyAccessorAugmentations(int offset) {
-    var reader = ResolutionReader(
-      _elementFactory,
-      _referenceReader,
-      _reader.fork(_baseResolutionOffset + offset),
-    );
-    var accessors = reader.readElementList<PropertyAccessorElementImpl>();
-    for (var element in accessors) {
-      element.linkedData?.read(element);
-    }
-
-    var properties = reader.readElementList<PropertyInducingElementImpl>();
-    for (var element in properties) {
-      element.linkedData?.read(element);
-    }
-  }
-
   PropertyAccessorElementImpl _readPropertyAccessorElement(
     CompilationUnitElementImpl unitElement,
     ElementImpl classElement,

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

@@ -54,17 +54,6 @@ class BundleWriter {
     references: _references,
   );
 
-  /// [_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.
-  List<PropertyAccessorElementImpl> _accessorAugmentations = [];
-
-  /// [_writeFieldElement] adds augmentations here, so that after
-  /// reading the library we can read them, and while doing this, update
-  /// getters and setter to point at this property augmentation, and set
-  /// `getter` and `setter` of the augmentation.
-  List<PropertyInducingElementImpl> _propertyAugmentations = [];
-
   final StringIndexer _stringIndexer = StringIndexer();
 
   final List<_Library> _libraries = [];
@@ -107,8 +96,6 @@ class BundleWriter {
 
   void writeLibraryElement(LibraryElementImpl libraryElement) {
     var libraryOffset = _sink.offset;
-    _accessorAugmentations = [];
-    _propertyAugmentations = [];
 
     // Write non-resolution data for the library.
     _sink._writeStringReference(libraryElement.name);
@@ -130,8 +117,6 @@ class BundleWriter {
     _writeFieldNameNonPromotabilityInfo(
         libraryElement.fieldNameNonPromotabilityInfo);
 
-    _writePropertyAccessorAugmentations();
-
     var lastUnit = libraryElement.units.lastOrNull;
     var macroGenerated = lastUnit?.macroGenerated;
 
@@ -423,11 +408,6 @@ class BundleWriter {
     _resolutionSink._writeAnnotationList(element.metadata);
     _resolutionSink.writeMacroDiagnostics(element.macroDiagnostics);
     _resolutionSink.writeType(element.type);
-
-    if (element.isAugmentation) {
-      _propertyAugmentations.add(element);
-    }
-
     _resolutionSink._writeOptionalNode(element.constantInitializer);
   }
 
@@ -647,15 +627,6 @@ class BundleWriter {
     }
   }
 
-  /// Write information to update `getter` and `setter` properties of
-  /// augmented variables to use the corresponding augmentations.
-  void _writePropertyAccessorAugmentations() {
-    var offset = _resolutionSink.offset;
-    _resolutionSink._writeElementList(_accessorAugmentations);
-    _resolutionSink._writeElementList(_propertyAugmentations);
-    _sink.writeUInt30(offset);
-  }
-
   void _writePropertyAccessorElement(PropertyAccessorElementImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
@@ -671,10 +642,6 @@ class BundleWriter {
     if (!element.isAugmentation) {
       _writeReference(element.variable2!);
     }
-
-    if (element.isAugmentation) {
-      _accessorAugmentations.add(element);
-    }
   }
 
   /// Write the reference of a non-local element.
@@ -702,10 +669,6 @@ class BundleWriter {
     _resolutionSink.writeMacroDiagnostics(element.macroDiagnostics);
     _resolutionSink.writeType(element.type);
 
-    if (element.isAugmentation) {
-      _propertyAugmentations.add(element);
-    }
-
     _resolutionSink._writeOptionalNode(element.constantInitializer);
   }