Elements. Remove FragmentImpl.reference

scheglov · Commit Queue · commit c58e180287c4 · 2025-06-18T13:15:49.000-07:00
Change-Id: If586b6f365770c752b7e6c3bd2ae39cd8bf394f7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435601 Reviewed-by: Paul Berry <paulberry@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart
@@ -116,11 +116,7 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
 
   String _elementToReferenceString(Element element) {
     var enclosingElement = element.enclosingElement;
-    var reference = switch (element) {
-      ElementImpl() =>
-        element.reference ?? (element.firstFragment as FragmentImpl).reference,
-      _ => null,
-    };
+    var reference = (element as ElementImpl).reference;
     if (reference != null) {
       return _referenceToString(reference);
     } else if (element is FormalParameterElement) {
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/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 = 476;
+  static const int DATA_VERSION = 477;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1206,8 +1206,7 @@ mixin ConstVariableFragment implements FragmentImpl, ConstantEvaluationTarget {
       if (library == null) {
         throw StateError(
           '[library: null][this: ($runtimeType) $this]'
-          '[enclosingElement: $enclosingElement3]'
-          '[reference: $reference]',
+          '[enclosingElement: $enclosingElement3]',
         );
       }
       computeConstants(
@@ -2445,7 +2444,7 @@ abstract class ExecutableFragmentImpl extends _ExistingFragmentImpl
 
   /// Initialize a newly created executable element to have the given [name] and
   /// [offset].
-  ExecutableFragmentImpl({required super.nameOffset, super.reference});
+  ExecutableFragmentImpl({required super.nameOffset});
 
   @override
   List<Fragment> get children3 => [...typeParameters, ...parameters];
@@ -2710,14 +2709,6 @@ class ExtensionFragmentImpl extends InstanceFragmentImpl
     return element.extendedType;
   }
 
-  @override
-  String get identifier {
-    if (reference != null) {
-      return reference!.name;
-    }
-    return super.identifier;
-  }
-
   @override
   bool get isPrivate {
     var name = name2;
@@ -3868,8 +3859,6 @@ abstract class FragmentImpl implements FragmentOrMember {
   /// is the defining unit of the library.
   FragmentImpl? enclosingElement3;
 
-  Reference? reference;
-
   /// The offset of the name of this element in the file that contains the
   /// declaration of this element.
   int _nameOffset = 0;
@@ -3889,10 +3878,7 @@ abstract class FragmentImpl implements FragmentOrMember {
 
   /// Initialize a newly created element to have the given [name] at the given
   /// [_nameOffset].
-  FragmentImpl({required int nameOffset, this.reference})
-    : _nameOffset = nameOffset {
-    reference?.element = this;
-  }
+  FragmentImpl({required int nameOffset}) : _nameOffset = nameOffset;
 
   /// The length of the element's code, or `null` if the element is synthetic.
   int? get codeLength => _codeLength;
@@ -4558,8 +4544,7 @@ class GetterFragmentImpl extends PropertyAccessorFragmentImpl
 
   GetterFragmentImpl({required super.name2, required super.nameOffset});
 
-  GetterFragmentImpl.forVariable(super.variable, {super.reference})
-    : super.forVariable();
+  GetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
   @override
   PropertyAccessorFragmentImpl? get correspondingGetter => null;
@@ -7054,14 +7039,10 @@ class LibraryImportImpl extends ElementDirectiveImpl implements LibraryImport {
 
 /// The provider for the lazily created `loadLibrary` function.
 final class LoadLibraryFunctionProvider {
-  final Reference fragmentReference;
   final Reference elementReference;
   TopLevelFunctionElementImpl? _element;
 
-  LoadLibraryFunctionProvider({
-    required this.fragmentReference,
-    required this.elementReference,
-  });
+  LoadLibraryFunctionProvider({required this.elementReference});
 
   TopLevelFunctionElementImpl getElement(LibraryElementImpl library) {
     return _element ??= _create(library);
@@ -7076,9 +7057,6 @@ final class LoadLibraryFunctionProvider {
     fragment.returnType = library.typeProvider.futureDynamicType;
     fragment.enclosingElement3 = library.definingCompilationUnit;
 
-    fragment.reference = fragmentReference;
-    fragmentReference.element = fragment;
-
     return TopLevelFunctionElementImpl(elementReference, fragment)
       ..returnType = library.typeProvider.futureDynamicType;
   }
@@ -8967,10 +8945,9 @@ sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
   /// Initialize a newly created synthetic property accessor element to be
   /// associated with the given [variable].
   PropertyAccessorFragmentImpl.forVariable(
-    PropertyInducingFragmentImpl variable, {
-    super.reference,
-  }) : name2 = variable.name2,
-       super(nameOffset: -1) {
+    PropertyInducingFragmentImpl variable,
+  ) : name2 = variable.name2,
+      super(nameOffset: -1) {
     isAbstract = variable is FieldFragmentImpl && variable.isAbstract;
     isStatic = variable.isStatic;
     isSynthetic = true;
@@ -9057,12 +9034,8 @@ sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
 /// Implicit getter for a [PropertyInducingFragmentImpl].
 class PropertyAccessorFragmentImplImplicitGetter extends GetterFragmentImpl {
   /// Create the implicit getter and bind it to the [property].
-  PropertyAccessorFragmentImplImplicitGetter(
-    super.property, {
-    Reference? reference,
-  }) : super.forVariable(reference: reference) {
-    reference?.element = this;
-  }
+  PropertyAccessorFragmentImplImplicitGetter(super.property)
+    : super.forVariable();
 
   @override
   FragmentImpl get enclosingElement3 {
@@ -9123,7 +9096,7 @@ class PropertyAccessorFragmentImplImplicitGetter extends GetterFragmentImpl {
 /// Implicit setter for a [PropertyInducingFragmentImpl].
 class PropertyAccessorFragmentImplImplicitSetter extends SetterFragmentImpl {
   /// Create the implicit setter and bind it to the [property].
-  PropertyAccessorFragmentImplImplicitSetter(super.property, {super.reference})
+  PropertyAccessorFragmentImplImplicitSetter(super.property)
     : super.forVariable();
 
   @override
@@ -9442,11 +9415,6 @@ abstract class PropertyInducingFragmentImpl
       }
     }
   }
-
-  void bindReference(Reference reference) {
-    this.reference = reference;
-    reference.element = this;
-  }
 }
 
 /// Common base class for all analyzer-internal classes that implement
@@ -9565,8 +9533,7 @@ class SetterFragmentImpl extends PropertyAccessorFragmentImpl
 
   SetterFragmentImpl({required super.name2, required super.nameOffset});
 
-  SetterFragmentImpl.forVariable(super.variable, {super.reference})
-    : super.forVariable();
+  SetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
   @override
   PropertyAccessorFragmentImpl? get correspondingGetter => variable2?.getter;
@@ -10899,7 +10866,7 @@ mixin WrappedElementMixin implements ElementImpl {
 
 abstract class _ExistingFragmentImpl extends FragmentImpl
     with _HasLibraryMixin {
-  _ExistingFragmentImpl({required super.nameOffset, super.reference});
+  _ExistingFragmentImpl({required super.nameOffset});
 }
 
 /// An element that can be declared in multiple fragments.
diff --git a/pkg/analyzer/lib/src/summary2/bundle_reader.dart b/pkg/analyzer/lib/src/summary2/bundle_reader.dart
@@ -166,7 +166,6 @@ class LibraryReader {
     _libraryElement.manifest = manifest;
 
     _libraryElement.loadLibraryProvider = LoadLibraryFunctionProvider(
-      fragmentReference: _readReference(),
       elementReference: _readReference(),
     );
 
@@ -1073,7 +1072,6 @@ class LibraryReader {
       var isDefault = _reader.readBool();
       var isInitializingFormal = _reader.readBool();
       var isSuperFormal = _reader.readBool();
-      var reference = _readOptionalReference();
 
       var kindIndex = _reader.readByte();
       var kind = ResolutionReader._formalParameterKind(kindIndex);
@@ -1125,10 +1123,6 @@ class LibraryReader {
             parameterKind: kind,
           );
         }
-        if (reference != null) {
-          element.reference = reference;
-          reference.element = element;
-        }
       }
       idFragmentMap[id] = element;
       ParameterElementFlags.read(_reader, element);
diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -546,7 +546,6 @@ class BundleWriter {
 
   void _writeLoadLibraryFunctionReferences(LibraryElementImpl library) {
     var element = library.loadLibraryFunction2;
-    _writeReference2(element.firstFragment.reference);
     _writeReference2(element.reference);
   }
 
@@ -653,7 +652,6 @@ class BundleWriter {
     _sink.writeBool(element is ConstVariableFragment);
     _sink.writeBool(element.isInitializingFormal);
     _sink.writeBool(element.isSuperFormal);
-    _writeOptionalReference(element.reference);
     _sink._writeFormalParameterKind(element);
     ParameterElementFlags.write(_sink, element);
 
diff --git a/pkg/analyzer/lib/src/summary2/element_builder.dart b/pkg/analyzer/lib/src/summary2/element_builder.dart
@@ -1374,7 +1374,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
     var functionExpression = node.functionExpression;
     var body = functionExpression.body;
 
-    Reference reference;
     ExecutableFragmentImpl executableFragment;
     if (node.isGetter) {
       var getterFragment = GetterFragmentImpl(
@@ -1385,7 +1384,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
       getterFragment.isAugmentation = node.augmentKeyword != null;
       getterFragment.isStatic = true;
 
-      reference = Reference.root(); // TODO(scheglov): remove this
       getterFragment.enclosingElement3 = _unitElement;
       executableFragment = getterFragment;
 
@@ -1400,7 +1398,6 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
       setterFragment.isAugmentation = node.augmentKeyword != null;
       setterFragment.isStatic = true;
 
-      reference = Reference.root(); // TODO(scheglov): remove this
       setterFragment.enclosingElement3 = _unitElement;
       executableFragment = setterFragment;
 
@@ -1416,7 +1413,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
       fragment.isStatic = true;
       executableFragment = fragment;
 
-      reference = _enclosingContext.addFunction(name, fragment);
+      _enclosingContext.addFunction(name, fragment);
 
       fragment.enclosingElement3 = _unitElement;
       _libraryBuilder.addTopFragment(fragment);
@@ -1434,7 +1431,7 @@ class FragmentBuilder extends ThrowingAstVisitor<void> {
     _linker.elementNodes[executableFragment] = node;
 
     _buildExecutableElementChildren(
-      reference: reference,
+      reference: Reference.root(), // TODO(scheglov): remove this
       fragment: executableFragment,
       formalParameters: functionExpression.parameters,
       typeParameters: functionExpression.typeParameters,
@@ -2240,10 +2237,6 @@ class _EnclosingContext {
     return _fields.toFixedList();
   }
 
-  Reference get fragmentReference {
-    return fragment.reference!;
-  }
-
   List<TopLevelFunctionFragmentImpl> get functions {
     return _functions.toFixedList();
   }
@@ -2335,11 +2328,8 @@ class _EnclosingContext {
     _bindReference(reference, element);
   }
 
-  Reference addFunction(String name, TopLevelFunctionFragmentImpl element) {
+  void addFunction(String name, TopLevelFunctionFragmentImpl element) {
     _functions.add(element);
-    var containerName =
-        element.isAugmentation ? '@functionAugmentation' : '@function';
-    return _addReference(containerName, name, element);
   }
 
   Reference addGetter(String name, PropertyAccessorFragmentImpl element) {
@@ -2363,15 +2353,8 @@ class _EnclosingContext {
     return _addReference(containerName, name, element);
   }
 
-  Reference? addParameter(String? name, FormalParameterFragmentImpl element) {
+  void addParameter(String? name, FormalParameterFragmentImpl element) {
     _parameters.add(element);
-    if (name == null) {
-      return null;
-    }
-    if (fragment.reference == null) {
-      return null;
-    }
-    return _addReference('@parameter', name, element);
   }
 
   void addPropertyAccessorSynthetic(PropertyAccessorFragmentImpl element) {
@@ -2385,16 +2368,8 @@ class _EnclosingContext {
     return _addReference(containerName, name, element);
   }
 
-  Reference addTopLevelVariable(
-    String name,
-    TopLevelVariableFragmentImpl element,
-  ) {
+  void addTopLevelVariable(String name, TopLevelVariableFragmentImpl element) {
     _topLevelVariables.add(element);
-    var containerName =
-        element.isAugmentation
-            ? '@topLevelVariableAugmentation'
-            : '@topLevelVariable';
-    return _addReference(containerName, name, element);
   }
 
   void addTopLevelVariableSynthetic(
@@ -2422,15 +2397,12 @@ class _EnclosingContext {
     String name,
     FragmentImpl element,
   ) {
-    var containerRef = fragmentReference.getChild(containerName);
-    var reference = containerRef.addChild(name);
-    _bindReference(reference, element);
-    return reference;
+    // TODO(scheglov): remove this method
+    throw StateError('Should not be used');
   }
 
   void _bindReference(Reference reference, FragmentImpl fragment) {
-    reference.element = fragment;
-    fragment.reference = reference;
-    this.fragment.encloseElement(fragment);
+    // TODO(scheglov): remove this method
+    throw StateError('Should not be used');
   }
 }
diff --git a/pkg/analyzer/lib/src/summary2/library_builder.dart b/pkg/analyzer/lib/src/summary2/library_builder.dart
diff --git a/pkg/analyzer/test/src/dart/analysis/session_test.dart b/pkg/analyzer/test/src/dart/analysis/session_test.dart
diff --git a/pkg/analyzer/test/util/element_printer.dart b/pkg/analyzer/test/util/element_printer.dart
