Elements. Migrate DefaultTypesBuilder.
Change-Id: Ic9742f46b3d83077baa720112d2576b1f40ac6f8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405662
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/default_types_builder.dart b/pkg/analyzer/lib/src/summary2/default_types_builder.dart
index 906f815..f0af7a6 100644
--- a/pkg/analyzer/lib/src/summary2/default_types_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/default_types_builder.dart
@@ -2,10 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// ignore_for_file: analyzer_use_new_elements
-
import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/dart/ast/ast.dart';
@@ -27,52 +24,52 @@
void build(List<AstNode> nodes) {
for (var node in nodes) {
if (node is ClassDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is ClassTypeAlias) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is EnumDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is ExtensionDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is ExtensionTypeDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is FunctionTypeAlias) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is GenericTypeAlias) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is MixinDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is MethodDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.typeParameters);
_breakRawTypeCycles(element, node.typeParameters);
_computeBounds(element, node.typeParameters);
} else if (node is FunctionDeclaration) {
- var element = node.declaredElement!;
+ var element = node.declaredFragment!.element;
_breakSelfCycles(node.functionExpression.typeParameters);
_breakRawTypeCycles(element, node.functionExpression.typeParameters);
_computeBounds(element, node.functionExpression.typeParameters);
@@ -104,7 +101,7 @@
}
void _breakRawTypeCycles(
- Element declarationElement,
+ Element2 declarationElement,
TypeParameterList? parameterList,
) {
if (parameterList == null) return;
@@ -118,7 +115,7 @@
parameter,
boundNode.typeOrThrow,
declarationElement,
- Set<Element>.identity(),
+ Set<Element2>.identity(),
);
allCycles.addAll(cycles);
}
@@ -181,7 +178,7 @@
if (parameterList == null) return;
for (var parameter in parameterList.typeParameters) {
- var element = parameter.declaredElement as TypeParameterElementImpl;
+ var element = parameter.declaredFragment as TypeParameterElementImpl;
var defaultType = element.defaultType;
if (defaultType is TypeBuilder) {
var builtType = defaultType.build();
@@ -193,7 +190,7 @@
/// Compute bounds to be provided as type arguments in place of missing type
/// arguments on raw types with the given type parameters.
void _computeBounds(
- Element declarationElement,
+ Element2 declarationElement,
TypeParameterList? parameterList,
) {
if (parameterList == null) return;
@@ -203,19 +200,19 @@
var nodes = parameterList.typeParameters;
var length = nodes.length;
- var elements = <TypeParameterElementImpl>[];
+ var elements = <TypeParameterElementImpl2>[];
var bounds = <DartType>[];
for (int i = 0; i < length; i++) {
var node = nodes[i];
- elements.add(node.declaredElement as TypeParameterElementImpl);
+ elements.add(node.declaredFragment!.element as TypeParameterElementImpl2);
bounds.add(node.bound?.type ?? dynamicType);
}
var graph = _TypeParametersGraph(elements, bounds);
var stronglyConnected = computeStrongComponents(graph);
for (var component in stronglyConnected) {
- var dynamicSubstitution = <TypeParameterElement, DartType>{};
- var nullSubstitution = <TypeParameterElement, DartType>{};
+ var dynamicSubstitution = <TypeParameterElement2, DartType>{};
+ var nullSubstitution = <TypeParameterElement2, DartType>{};
for (var i in component) {
var element = elements[i];
dynamicSubstitution[element] = dynamicType;
@@ -234,8 +231,8 @@
}
for (var i = 0; i < length; i++) {
- var thisSubstitution = <TypeParameterElement, DartType>{};
- var nullSubstitution = <TypeParameterElement, DartType>{};
+ var thisSubstitution = <TypeParameterElement2, DartType>{};
+ var nullSubstitution = <TypeParameterElement2, DartType>{};
var element = elements[i];
thisSubstitution[element] = bounds[i];
nullSubstitution[element] = bottomType;
@@ -253,7 +250,7 @@
// Set computed TypeBuilder(s) as default types.
for (var i = 0; i < length; i++) {
- var element = nodes[i].declaredElement as TypeParameterElementImpl;
+ var element = nodes[i].declaredFragment as TypeParameterElementImpl;
element.defaultType = bounds[i];
}
}
@@ -263,21 +260,21 @@
List<List<_CycleElement>> _findRawTypePathsToDeclaration(
TypeParameter startParameter,
DartType startType,
- Element end,
- Set<Element> visited,
+ Element2 end,
+ Set<Element2> visited,
) {
var paths = <List<_CycleElement>>[];
if (startType is NamedTypeBuilder) {
- var declaration = startType.element;
+ var declaration = startType.element3;
if (startType.arguments.isEmpty) {
- if (startType.element == end) {
+ if (startType.element3 == end) {
paths.add([
_CycleElement(startParameter, startType),
]);
- } else if (visited.add(startType.element)) {
- void recurseParameters(List<TypeParameterElement> parameters) {
+ } else if (visited.add(startType.element3)) {
+ void recurseParameters(List<TypeParameterElement2> parameters) {
for (var parameter in parameters) {
- var parameterNode = _linker.getLinkingNode(parameter);
+ var parameterNode = _linker.getLinkingNode2(parameter);
if (parameterNode is TypeParameter) {
var bound = parameterNode.bound;
if (bound != null) {
@@ -298,12 +295,12 @@
}
}
- if (declaration is InterfaceElement) {
- recurseParameters(declaration.typeParameters);
- } else if (declaration is TypeAliasElement) {
- recurseParameters(declaration.typeParameters);
+ if (declaration is InterfaceElement2) {
+ recurseParameters(declaration.typeParameters2);
+ } else if (declaration is TypeAliasElement2) {
+ recurseParameters(declaration.typeParameters2);
}
- visited.remove(startType.element);
+ visited.remove(startType.element3);
}
} else {
for (var argument in startType.arguments) {
@@ -326,7 +323,7 @@
visited,
),
);
- for (var typeParameter in startType.typeFormals) {
+ for (var typeParameter in startType.typeParameters) {
var bound = typeParameter.bound;
if (bound != null) {
paths.addAll(
@@ -339,7 +336,7 @@
);
}
}
- for (var formalParameter in startType.parameters) {
+ for (var formalParameter in startType.formalParameters) {
paths.addAll(
_findRawTypePathsToDeclaration(
startParameter,
@@ -372,10 +369,10 @@
// the type parameter with the index `i` in their bounds.
final List<List<int>> _edges = [];
- final Map<TypeParameterElement, int> _parameterToIndex = Map.identity();
+ final Map<TypeParameterElement2, int> _parameterToIndex = Map.identity();
_TypeParametersGraph(
- List<TypeParameterElement> parameters,
+ List<TypeParameterElement2> parameters,
List<DartType> bounds,
) {
assert(parameters.length == bounds.length);
@@ -400,10 +397,10 @@
/// Collect references to the [index]th type parameter from the [type].
void _collectReferencesFrom(int index, DartType? type) {
if (type is FunctionTypeBuilder) {
- for (var parameter in type.typeFormals) {
+ for (var parameter in type.typeParameters) {
_collectReferencesFrom(index, parameter.bound);
}
- for (var parameter in type.parameters) {
+ for (var parameter in type.formalParameters) {
_collectReferencesFrom(index, parameter.type);
}
_collectReferencesFrom(index, type.returnType);
@@ -412,7 +409,7 @@
_collectReferencesFrom(index, argument);
}
} else if (type is TypeParameterType) {
- var typeIndex = _parameterToIndex[type.element];
+ var typeIndex = _parameterToIndex[type.element3];
if (typeIndex != null) {
_edges[typeIndex].add(index);
}
@@ -421,13 +418,13 @@
}
class _UpperLowerReplacementVisitor extends ReplacementVisitor {
- final Map<TypeParameterElement, DartType> _upper;
- final Map<TypeParameterElement, DartType> _lower;
+ final Map<TypeParameterElement2, DartType> _upper;
+ final Map<TypeParameterElement2, DartType> _lower;
Variance _variance;
_UpperLowerReplacementVisitor({
- required Map<TypeParameterElement, DartType> upper,
- required Map<TypeParameterElement, DartType> lower,
+ required Map<TypeParameterElement2, DartType> upper,
+ required Map<TypeParameterElement2, DartType> lower,
required Variance variance,
}) : _upper = upper,
_lower = lower,
@@ -465,9 +462,9 @@
@override
DartType? visitTypeParameterType(TypeParameterType type) {
if (_variance == Variance.contravariant) {
- return _lower[type.element];
+ return _lower[type.element3];
} else {
- return _upper[type.element];
+ return _upper[type.element3];
}
}
}
diff --git a/pkg/analyzer/lib/src/summary2/link.dart b/pkg/analyzer/lib/src/summary2/link.dart
index 61416b5..329b55c 100644
--- a/pkg/analyzer/lib/src/summary2/link.dart
+++ b/pkg/analyzer/lib/src/summary2/link.dart
@@ -9,6 +9,7 @@
import 'package:analyzer/dart/analysis/declared_variables.dart';
import 'package:analyzer/dart/ast/ast.dart' as ast;
import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/src/context/context.dart';
import 'package:analyzer/src/dart/analysis/file_state.dart';
import 'package:analyzer/src/dart/element/element.dart';
@@ -29,6 +30,7 @@
import 'package:analyzer/src/summary2/variance_builder.dart';
import 'package:analyzer/src/util/performance/operation_performance.dart';
import 'package:analyzer/src/utilities/extensions/collection.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:analyzer/src/utilities/uri_cache.dart';
import 'package:macros/src/executor/multi_executor.dart' as macro;
@@ -104,6 +106,12 @@
return elementNodes[element];
}
+ /// If the [element] is part of a library being linked, return the node
+ /// from which it was created.
+ ast.AstNode? getLinkingNode2(Element2 element) {
+ return elementNodes[element.asElement];
+ }
+
Future<void> link({
required OperationPerformanceImpl performance,
required List<LibraryFileKind> inputLibraries,
diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index d9f00ea..94cc45b 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart
@@ -43292,7 +43292,7 @@
typeParameters
covariant T @37
bound: A<dynamic>
- defaultType: A<dynamic>
+ defaultType: dynamic
augmentationTarget: <testLibraryFragment>::@class::A
----------------------------------------
library
diff --git a/pkg/analyzer/test/src/summary/elements/mixin_test.dart b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
index 7acafed..4aeb482 100644
--- a/pkg/analyzer/test/src/summary/elements/mixin_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/mixin_test.dart
@@ -8752,7 +8752,7 @@
typeParameters
covariant T @37
bound: A<dynamic>
- defaultType: A<dynamic>
+ defaultType: dynamic
augmentationTarget: <testLibraryFragment>::@mixin::A
----------------------------------------
library
