Elements. Add reference to FieldElementImpl2, write it.

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

Author: scheglov

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

@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // 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 = 470;
+  static const int DATA_VERSION = 471;
 
   /// 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

@@ -2847,15 +2847,15 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
         FragmentedElementMixin<FieldFragmentImpl>,
         _HasSinceSdkVersionMixin
     implements FieldElement2OrMember {
+  @override
+  final Reference reference;
+
   @override
   final FieldFragmentImpl firstFragment;
 
-  FieldElementImpl2(this.firstFragment) {
-    FieldFragmentImpl? fragment = firstFragment;
-    while (fragment != null) {
-      fragment.element = this;
-      fragment = fragment.nextFragment;
-    }
+  FieldElementImpl2({required this.reference, required this.firstFragment}) {
+    reference.element2 = this;
+    firstFragment.element = this;
   }
 
   @override
@@ -3054,8 +3054,8 @@ class FieldFragmentImpl extends PropertyInducingElementImpl
   /// annotations, but also inferred types.
   bool hasEnclosingTypeParameterReference = true;
 
-  /// The element corresponding to this fragment.
-  FieldElementImpl2? _element;
+  @override
+  late final FieldElementImpl2 element;
 
   /// Initialize a newly created synthetic field element to have the given
   /// [name] at the given [offset].
@@ -3064,24 +3064,6 @@ class FieldFragmentImpl extends PropertyInducingElementImpl
   @override
   FieldFragmentImpl get declaration => this;
 
-  @override
-  FieldElementImpl2 get element {
-    if (_element != null) {
-      return _element!;
-    }
-    FieldFragment firstFragment = this;
-    var previousFragment = firstFragment.previousFragment;
-    while (previousFragment != null) {
-      firstFragment = previousFragment;
-      previousFragment = firstFragment.previousFragment;
-    }
-    // As a side-effect of creating the element, all of the fragments in the
-    // chain will have their `_element` set to the newly created element.
-    return FieldElementImpl2(firstFragment as FieldFragmentImpl);
-  }
-
-  set element(FieldElementImpl2 element) => _element = element;
-
   /// Whether the field is abstract.
   ///
   /// Executable fields are abstract if they are declared with the `abstract`

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

@@ -1206,6 +1206,16 @@ class InheritanceManager3 {
       resultField.type = executable.parameters[0].type;
       result.variable2 = resultField;
 
+      var elementName = executable.asElement2.name3!;
+      var elementReference = class_.element.reference!
+          .getChild('@field')
+          .getChild(elementName);
+      assert(elementReference.element2 == null);
+      FieldElementImpl2(
+        reference: elementReference,
+        firstFragment: resultField,
+      );
+
       return result;
     }
 
@@ -1279,16 +1289,36 @@ class InheritanceManager3 {
       return result;
     } else {
       var firstAccessor = first as PropertyAccessorElementOrMember;
-      var fragmentName = first.asElement2.firstFragment.name2;
+      var fragmentName = first.asElement2.firstFragment.name2!;
       var field = FieldFragmentImpl(name2: fragmentName, nameOffset: -1);
 
       PropertyAccessorFragmentImpl result;
       if (firstAccessor.isGetter) {
-        field.getter =
-            result = GetterFragmentImpl(name2: fragmentName, nameOffset: -1);
+        var fragmentReference = targetClass.reference!
+            .getChild('@getter')
+            .getChild(fragmentName);
+        if (fragmentReference.element case GetterFragmentImpl result) {
+          return result;
+        }
+
+        var fragment = GetterFragmentImpl(name2: fragmentName, nameOffset: -1);
+        fragment.reference = fragmentReference;
+        fragmentReference.element = fragment;
+        field.getter = fragment;
+        result = fragment;
       } else {
-        field.setter =
-            result = SetterFragmentImpl(name2: fragmentName, nameOffset: -1);
+        var fragmentReference = targetClass.reference!
+            .getChild('@setter')
+            .getChild(fragmentName);
+        if (fragmentReference.element case SetterFragmentImpl result) {
+          return result;
+        }
+
+        var fragment = SetterFragmentImpl(name2: fragmentName, nameOffset: -1);
+        fragment.reference = fragmentReference;
+        fragmentReference.element = fragment;
+        field.setter = fragment;
+        result = fragment;
       }
       result.enclosingElement3 = targetClass;
       result.returnType = resultType.returnType;
@@ -1306,6 +1336,13 @@ class InheritanceManager3 {
       }
       result.variable2 = field;
 
+      var elementName = first.asElement2.name3!;
+      var elementReference = targetClass.element.reference!
+          .getChild('@field')
+          .getChild(elementName);
+      assert(elementReference.element2 == null);
+      FieldElementImpl2(reference: elementReference, firstFragment: field);
+
       return result;
     }
   }

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

@@ -1089,6 +1089,7 @@ class LibraryReader {
     var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
 
     var reference = _readReference();
+    var reference2 = _readReference();
     var getterReference = _readOptionalReference();
     var setterReference = _readOptionalReference();
     var fragmentName = _readFragmentName();
@@ -1125,6 +1126,8 @@ class LibraryReader {
       }
     }
 
+    FieldElementImpl2(reference: reference2, firstFragment: element);
+
     return element;
   }
 
@@ -1515,8 +1518,7 @@ class LibraryReader {
 
       // Read the property references.
       var propertyFragmentReference = _readReference();
-      // TODO(scheglov): should be required?
-      var propertyElementReference = _readOptionalReference();
+      var propertyElementReference = _readReference();
 
       bool canUseExisting(PropertyInducingElementImpl property) {
         return property.isSynthetic ||
@@ -1542,8 +1544,6 @@ class LibraryReader {
           propertyFragmentReference.element ??= propertyFragment;
           propertyFragments.add(variableFragment);
 
-          // TODO(scheglov): should be required?
-          propertyElementReference!;
           var variableElement = TopLevelVariableElementImpl2(
             propertyElementReference,
             variableFragment,
@@ -1555,7 +1555,7 @@ class LibraryReader {
         if (existing is FieldFragmentImpl && canUseExisting(existing)) {
           propertyFragment = existing;
         } else {
-          propertyFragment =
+          var fieldFragment =
               FieldFragmentImpl(name2: accessor.name2, nameOffset: -1)
                 ..enclosingElement3 = enclosingElement
                 ..reference = propertyFragmentReference
@@ -1564,8 +1564,14 @@ class LibraryReader {
                 ..isPromotable = isPromotable
                 ..hasEnclosingTypeParameterReference =
                     accessor.hasEnclosingTypeParameterReference;
+          propertyFragment = fieldFragment;
           propertyFragmentReference.element ??= propertyFragment;
           propertyFragments.add(propertyFragment);
+
+          FieldElementImpl2(
+            reference: propertyElementReference,
+            firstFragment: fieldFragment,
+          );
         }
       }
 

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

@@ -24,7 +24,6 @@ import 'package:analyzer/src/summary2/element_flags.dart';
 import 'package:analyzer/src/summary2/export.dart';
 import 'package:analyzer/src/summary2/reference.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
-import 'package:analyzer/src/utilities/extensions/object.dart';
 
 class BundleWriter {
   late final _BundleWriterReferences _references;
@@ -321,6 +320,7 @@ class BundleWriter {
   void _writeFieldElement(FieldFragmentImpl element) {
     _sink.writeUInt30(_resolutionSink.offset);
     _writeReference(element);
+    _writeReference2(element.element.reference);
     _writeOptionalReference(element.getter?.reference);
     _writeOptionalReference(element.setter?.reference);
     _writeFragmentName(element);
@@ -541,12 +541,12 @@ class BundleWriter {
     if (!fragment.isAugmentation) {
       var variableFragment = fragment.variable2!;
       _writeReference(variableFragment);
-      _writeOptionalReference(
-        variableFragment
-            .ifTypeOrNull<TopLevelVariableFragmentImpl>()
-            ?.element
-            .reference,
-      );
+      switch (variableFragment) {
+        case FieldFragmentImpl fieldFragment:
+          _writeReference2(fieldFragment.element.reference);
+        case TopLevelVariableFragmentImpl topFragment:
+          _writeReference2(topFragment.element.reference);
+      }
       switch (variableFragment) {
         case FieldFragmentImpl fieldFragment:
           var field = fieldFragment.element;
@@ -713,7 +713,6 @@ class ResolutionSink extends _SummaryDataWriter {
         );
         _writeTypeList(typeArguments);
       // TODO(scheglov): give reference to each element below
-      case FieldElementImpl2():
       case FormalParameterElementImpl():
       case GetterElementImpl():
       case SetterElementImpl():

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

@@ -453,6 +453,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
         SimpleIdentifierImpl(token: StringToken(TokenType.STRING, name, -1)),
       );
       valuesNames.add(name);
+
+      FieldElementImpl2(
+        reference: elementBuilder.element.reference
+            .getChild('@field')
+            .addChild(refName),
+        firstFragment: field,
+      );
     }
 
     // Build the 'values' field.
@@ -508,6 +515,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
     holder.addNonSyntheticField('values', valuesField);
 
+    FieldElementImpl2(
+      reference: elementBuilder.element.reference
+          .getChild('@field')
+          .addChild('values'),
+      firstFragment: valuesField,
+    );
+
     _libraryBuilder.implicitEnumNodes[fragment] = ImplicitEnumNodes(
       element: fragment,
       valuesTypeNode: valuesTypeNode,
@@ -761,6 +775,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
 
       _linker.elementNodes[fragment] = variable;
       variable.declaredFragment = fragment;
+
+      var containerBuilder = _enclosingContext.instanceElementBuilder!;
+      var containerElement = containerBuilder.element;
+      var containerRef = containerElement.reference!.getChild('@field');
+      var elementReference = containerRef.addChild(refName);
+
+      FieldElementImpl2(reference: elementReference, firstFragment: fragment);
     }
     _buildType(node.fields.type);
   }
@@ -1767,6 +1788,16 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
                   ..isStatic = accessorElement.isStatic
                   ..isSynthetic = true;
         _enclosingContext.addFieldSynthetic(reference, field);
+
+        FieldElementImpl2(
+          reference: _enclosingContext
+              .instanceElementBuilder!
+              .element
+              .reference!
+              .getChild('@field')
+              .getChild(name),
+          firstFragment: field,
+        );
       }
     }
 
@@ -1811,6 +1842,13 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     _linker.elementNodes[fieldFragment] = representation;
     _enclosingContext.addNonSyntheticField(fieldName, fieldFragment);
 
+    FieldElementImpl2(
+      reference: extensionFragment.element.reference
+          .getChild('@field')
+          .addChild(fieldName),
+      firstFragment: fieldFragment,
+    );
+
     var nameOffset2 = fieldNameToken.offset.nullIfNegative;
 
     var formalParameterElement =

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -271,6 +271,11 @@ mixin ElementsTypesMixin {
     field.type = representationType;
     fragment.fields = [field];
 
+    FieldElementImpl2(
+      reference: Reference.root(),
+      firstFragment: field,
+    );
+
     fragment.typeErasure = representationType;
 
     return ExtensionTypeElementImpl2(Reference.root(), fragment);