Elements. Remove unnecessary 'instanceElementBuilder' and reference from element builder.
Change-Id: Ifacace991e1a44a76b489810107f21bc2d5a01a2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441980
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/element_builder.dart b/pkg/analyzer/lib/src/summary2/element_builder.dart
index 7e88e8f..36bb274 100644
--- a/pkg/analyzer/lib/src/summary2/element_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/element_builder.dart
@@ -770,10 +770,7 @@
required LibraryFragmentImpl unitElement,
}) : _libraryBuilder = libraryBuilder,
_unitElement = unitElement,
- _enclosingContext = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: unitElement,
- );
+ _enclosingContext = _EnclosingContext(fragment: unitElement);
Linker get _linker => _libraryBuilder.linker;
@@ -853,10 +850,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
node.members.accept(this);
@@ -894,10 +888,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
var typeParameters = node.typeParameters;
if (typeParameters != null) {
@@ -943,13 +934,11 @@
node.declaredFragment = fragment;
_linker.elementNodes[fragment] = node;
- var reference = Reference.root(); // TODO(scheglov): remove this
var parentFragment = _enclosingContext.fragment;
_libraryBuilder.addFragmentChild(parentFragment, fragment);
(parentFragment as InterfaceFragmentImpl).addConstructor(fragment);
_buildExecutableElementChildren(
- reference: reference,
fragment: fragment,
formalParameters: node.parameters,
);
@@ -974,10 +963,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
// Build fields for all enum constants.
var constants = node.constants;
@@ -1167,10 +1153,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
node.members.accept(this);
@@ -1204,10 +1187,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
_builtRepresentationDeclaration(
@@ -1291,10 +1271,7 @@
node.declaredFragment = fragment;
// TODO(scheglov): check that we don't set reference for parameters
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
var formalParameters = node.parameters;
if (formalParameters != null) {
@@ -1375,7 +1352,6 @@
_linker.elementNodes[executableFragment] = node;
_buildExecutableElementChildren(
- reference: Reference.root(), // TODO(scheglov): remove this
fragment: executableFragment,
formalParameters: functionExpression.parameters,
typeParameters: functionExpression.typeParameters,
@@ -1401,10 +1377,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
node.returnType?.accept(this);
@@ -1446,10 +1419,7 @@
node.declaredFragment = fragment;
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
var formalParameters = node.parameters;
formalParameters.accept(this);
@@ -1473,10 +1443,7 @@
node.declaredFragment = fragment;
_linker.elementNodes[fragment] = node;
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
var formalParameters = node.parameters;
formalParameters.accept(this);
@@ -1509,10 +1476,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
});
@@ -1546,7 +1510,6 @@
void visitMethodDeclaration(covariant MethodDeclarationImpl node) {
var nameToken = node.name;
- Reference reference;
ExecutableFragmentImpl executableFragment;
if (node.isGetter) {
var fragment = GetterFragmentImpl(
@@ -1557,7 +1520,6 @@
fragment.isAugmentation = node.augmentKeyword != null;
fragment.isStatic = node.isStatic;
- reference = Reference.root(); // TODO(scheglov): remove this
var parentFragment = _enclosingContext.fragment;
fragment.enclosingFragment = parentFragment;
_libraryBuilder.addFragmentChild(parentFragment, fragment);
@@ -1572,7 +1534,6 @@
fragment.isAugmentation = node.augmentKeyword != null;
fragment.isStatic = node.isStatic;
- reference = Reference.root(); // TODO(scheglov): remove this
var parentFragment = _enclosingContext.fragment;
fragment.enclosingFragment = parentFragment;
_libraryBuilder.addFragmentChild(parentFragment, fragment);
@@ -1587,7 +1548,6 @@
fragment.isAugmentation = node.augmentKeyword != null;
fragment.isStatic = node.isStatic;
- reference = Reference.root(); // TODO(scheglov): remove this
var parentFragment = _enclosingContext.fragment;
fragment.enclosingFragment = parentFragment;
_libraryBuilder.addFragmentChild(parentFragment, fragment);
@@ -1606,7 +1566,6 @@
_linker.elementNodes[executableFragment] = node;
_buildExecutableElementChildren(
- reference: reference,
fragment: executableFragment,
formalParameters: node.parameters,
typeParameters: node.typeParameters,
@@ -1633,10 +1592,7 @@
_libraryBuilder.addTopFragment(_unitElement, fragment);
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
node.typeParameters?.accept(this);
node.members.accept(this);
@@ -1752,10 +1708,7 @@
node.declaredFragment = fragment;
// TODO(scheglov): check that we don't set reference for parameters
- var holder = _EnclosingContext(
- instanceElementBuilder: null,
- fragment: fragment,
- );
+ var holder = _EnclosingContext(fragment: fragment);
_withEnclosing(holder, () {
var formalParameters = node.parameters;
if (formalParameters != null) {
@@ -1848,13 +1801,11 @@
}
void _buildExecutableElementChildren({
- required Reference reference,
required ExecutableFragmentImpl fragment,
FormalParameterList? formalParameters,
TypeParameterList? typeParameters,
}) {
var holder = _EnclosingContext(
- instanceElementBuilder: null,
fragment: fragment,
hasDefaultFormalParameters: true,
);
@@ -1968,7 +1919,6 @@
}
class _EnclosingContext {
- final Object? instanceElementBuilder; // TODO(scheglov): remove it
final FragmentImpl fragment;
final bool hasDefaultFormalParameters;
@@ -1976,7 +1926,6 @@
final List<TypeParameterFragmentImpl> typeParameters = [];
_EnclosingContext({
- required this.instanceElementBuilder,
required this.fragment,
this.hasDefaultFormalParameters = false,
});
