Elements. Use more TypeImpl around DartObjectImpl.

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

Author: scheglov

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -8772,7 +8772,7 @@ final class FunctionReferenceImpl extends CommentReferableExpressionImpl
   TypeArgumentListImpl? _typeArguments;
 
   @override
-  List<DartType>? typeArgumentTypes;
+  List<TypeImpl>? typeArgumentTypes;
 
   FunctionReferenceImpl({
     required ExpressionImpl function,
@@ -16114,7 +16114,7 @@ final class SimpleIdentifierImpl extends IdentifierImpl
   Element? _staticElement;
 
   @override
-  List<DartType>? tearOffTypeArgumentTypes;
+  List<TypeImpl>? tearOffTypeArgumentTypes;
 
   /// If this identifier is meant to be looked up in the enclosing scope, the
   /// raw result the scope lookup, prior to figuring out whether a write or a

pkg/analyzer/lib/src/dart/constant/constant_verifier.dart

@@ -297,7 +297,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
   void visitListLiteral(ListLiteral node) {
     super.visitListLiteral(node);
     if (node.isConst) {
-      var nodeType = node.staticType as InterfaceType;
+      var nodeType = node.staticType as InterfaceTypeImpl;
       var elementType = nodeType.typeArguments[0];
       var verifier = _ConstLiteralVerifier(
         this,
@@ -395,7 +395,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
     super.visitSetOrMapLiteral(node);
     if (node.isSet) {
       if (node.isConst) {
-        var nodeType = node.staticType as InterfaceType;
+        var nodeType = node.staticType as InterfaceTypeImpl;
         var elementType = nodeType.typeArguments[0];
         var config = _SetVerifierConfig(elementType: elementType);
         var verifier = _ConstLiteralVerifier(
@@ -413,7 +413,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
       }
     } else if (node.isMap) {
       if (node.isConst) {
-        var nodeType = node.staticType as InterfaceType;
+        var nodeType = node.staticType as InterfaceTypeImpl;
         var keyType = nodeType.typeArguments[0];
         var valueType = nodeType.typeArguments[1];
         var config = _MapVerifierConfig(
@@ -1069,7 +1069,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
 class _ConstLiteralVerifier {
   final ConstantVerifier verifier;
   final ErrorCode errorCode;
-  final DartType? listElementType;
+  final TypeImpl? listElementType;
   final _SetVerifierConfig? setConfig;
   final _MapVerifierConfig? mapConfig;
 
@@ -1228,7 +1228,7 @@ class _ConstLiteralVerifier {
   }
 
   bool _validateListExpression(
-      DartType listElementType, Expression expression, DartObjectImpl value) {
+      TypeImpl listElementType, Expression expression, DartObjectImpl value) {
     if (!verifier._runtimeTypeMatch(value, listElementType)) {
       if (verifier._runtimeTypeMatch(
           value, verifier._typeSystem.makeNullable(listElementType))) {
@@ -1471,8 +1471,8 @@ class _ConstLiteralVerifier {
 }
 
 class _MapVerifierConfig {
-  final DartType keyType;
-  final DartType valueType;
+  final TypeImpl keyType;
+  final TypeImpl valueType;
   final Map<DartObject, Expression> uniqueKeys = {};
   final Map<Expression, Expression> duplicateKeys = {};
 
@@ -1483,7 +1483,7 @@ class _MapVerifierConfig {
 }
 
 class _SetVerifierConfig {
-  final DartType elementType;
+  final TypeImpl elementType;
   final Map<DartObject, Expression> uniqueValues = {};
   final Map<Expression, Expression> duplicateElements = {};
 

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -340,7 +340,7 @@ class ConstantEvaluationEngine {
   Constant evaluateAndFormatErrorsInConstructorCall(
     LibraryElementImpl library,
     AstNode node,
-    List<DartType>? typeArguments,
+    List<TypeImpl>? typeArguments,
     List<Expression> arguments,
     ConstructorElementMixin constructor,
     ConstantVisitor constantVisitor, {
@@ -385,7 +385,7 @@ class ConstantEvaluationEngine {
   Constant evaluateConstructorCall(
     LibraryElementImpl library,
     AstNode node,
-    List<DartType>? typeArguments,
+    List<TypeImpl>? typeArguments,
     List<Expression> arguments,
     ConstructorElementMixin constructor,
     ConstantVisitor constantVisitor, {
@@ -544,7 +544,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   final Map<String, DartObjectImpl>? _lexicalEnvironment;
 
   /// A mapping of type parameter names to runtime values (types).
-  final Map<TypeParameterElement, DartType>? _lexicalTypeEnvironment;
+  final Map<TypeParameterElement, TypeImpl>? _lexicalTypeEnvironment;
 
   final Substitution? _substitution;
 
@@ -567,7 +567,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     this._library,
     this._errorReporter, {
     Map<String, DartObjectImpl>? lexicalEnvironment,
-    Map<TypeParameterElement, DartType>? lexicalTypeEnvironment,
+    Map<TypeParameterElement, TypeImpl>? lexicalTypeEnvironment,
     Substitution? substitution,
   })  : _lexicalEnvironment = lexicalEnvironment,
         _lexicalTypeEnvironment = lexicalTypeEnvironment,
@@ -815,7 +815,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       return InvalidConstant.forEntity(
           node, CompileTimeErrorCode.INVALID_CONSTANT);
     }
-    var classType = constructorFunctionType.returnType as InterfaceType;
+    var classType = constructorFunctionType.returnType as InterfaceTypeImpl;
     var typeArguments = classType.typeArguments;
     // The result is already instantiated during resolution;
     // [_dartObjectComputer.typeInstantiate] is unnecessary.
@@ -858,7 +858,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   }
 
   @override
-  Constant visitFunctionReference(FunctionReference node) {
+  Constant visitFunctionReference(covariant FunctionReferenceImpl node) {
     var functionResult = evaluateConstant(node.function);
     if (functionResult is! DartObjectImpl) {
       return functionResult;
@@ -890,7 +890,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       return _instantiateFunctionType(node, functionResult);
     }
 
-    var typeArguments = <DartType>[];
+    var typeArguments = <TypeImpl>[];
     for (var typeArgument in typeArgumentList.arguments) {
       var typeArgumentConstant = evaluateConstant(typeArgument);
       switch (typeArgumentConstant) {
@@ -920,7 +920,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   }
 
   @override
-  Constant visitGenericFunctionType(GenericFunctionType node) {
+  Constant visitGenericFunctionType(covariant GenericFunctionTypeImpl node) {
     return DartObjectImpl(
       typeSystem,
       _typeProvider.typeType,
@@ -1108,7 +1108,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       evaluateConstant(node.expression);
 
   @override
-  Constant visitPrefixedIdentifier(PrefixedIdentifier node) {
+  Constant visitPrefixedIdentifier(covariant PrefixedIdentifierImpl node) {
     var prefixNode = node.prefix;
     var prefixElement = prefixNode.staticElement;
 
@@ -1177,10 +1177,10 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   }
 
   @override
-  Constant visitPropertyAccess(PropertyAccess node) {
+  Constant visitPropertyAccess(covariant PropertyAccessImpl node) {
     var target = node.target;
     if (target != null) {
-      if (target is PrefixedIdentifier &&
+      if (target is PrefixedIdentifierImpl &&
           (target.staticElement is ExtensionElement ||
               target.staticElement is ExtensionTypeElement)) {
         var prefix = target.prefix;
@@ -1247,7 +1247,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   }
 
   @override
-  Constant? visitRecordTypeAnnotation(RecordTypeAnnotation node) {
+  Constant? visitRecordTypeAnnotation(covariant RecordTypeAnnotationImpl node) {
     return DartObjectImpl(
       typeSystem,
       _typeProvider.typeType,
@@ -1307,7 +1307,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   }
 
   @override
-  Constant visitSimpleIdentifier(SimpleIdentifier node) {
+  Constant visitSimpleIdentifier(covariant SimpleIdentifierImpl node) {
     var value = _lexicalEnvironment?[node.name];
     if (value != null) {
       return _instantiateFunctionTypeForSimpleIdentifier(node, value);
@@ -1727,9 +1727,9 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   Constant _getConstantValue({
     required AstNode errorNode,
     required Expression? expression,
-    required SimpleIdentifier? identifier,
+    required SimpleIdentifierImpl? identifier,
     required Element? element,
-    DartType? givenType,
+    TypeImpl? givenType,
   }) {
     var errorNode2 = _evaluationEngine.configuration.errorNode(errorNode);
     element = element?.declaration;
@@ -1795,7 +1795,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         }
         return _instantiateFunctionTypeForSimpleIdentifier(identifier, rawType);
       }
-    } else if (variableElement is InterfaceElement) {
+    } else if (variableElement is InterfaceElementImpl) {
       var type = givenType ??
           variableElement.instantiate(
             typeArguments: variableElement.typeParameters
@@ -1814,7 +1814,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         _typeProvider.typeType,
         TypeState(_typeProvider.dynamicType),
       );
-    } else if (variableElement is TypeAliasElement) {
+    } else if (variableElement is TypeAliasElementImpl) {
       var type = givenType ??
           variableElement.instantiate(
             typeArguments: variableElement.typeParameters
@@ -1928,7 +1928,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   /// argument types, returns [value] type-instantiated with those [node]'s
   /// type argument types, otherwise returns [value].
   DartObjectImpl _instantiateFunctionType(
-      FunctionReference node, DartObjectImpl value) {
+      FunctionReferenceImpl node, DartObjectImpl value) {
     var functionElement = value.toFunctionValue();
     if (functionElement is! ExecutableElementOrMember) {
       return value;
@@ -1956,7 +1956,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   /// type-instantiated with those [node]'s tear-off type argument types,
   /// otherwise returns [value].
   Constant _instantiateFunctionTypeForSimpleIdentifier(
-      SimpleIdentifier node, DartObjectImpl value) {
+      SimpleIdentifierImpl node, DartObjectImpl value) {
     // TODO(srawlins): When all code uses [FunctionReference]s generated via
     // generic function instantiation, remove this method and all call sites.
     var functionElement = value.toFunctionValue();
@@ -2298,7 +2298,7 @@ class DartObjectComputer {
 
   Constant typeInstantiate(
     DartObjectImpl function,
-    List<DartType> typeArguments,
+    List<TypeImpl> typeArguments,
     Expression node,
     TypeArgumentList typeArgumentsErrorNode,
   ) {
@@ -2430,7 +2430,7 @@ class _InstanceCreationEvaluator {
 
   final ConstructorElementMixin _constructor;
 
-  final List<DartType>? _typeArguments;
+  final List<TypeImpl>? _typeArguments;
 
   final ConstructorInvocation _invocation;
 
@@ -2440,7 +2440,7 @@ class _InstanceCreationEvaluator {
 
   final List<DartObjectImpl> _argumentValues;
 
-  final Map<TypeParameterElement, DartType> _typeParameterMap = HashMap();
+  final Map<TypeParameterElement, TypeImpl> _typeParameterMap = HashMap();
 
   final Map<String, DartObjectImpl> _parameterMap = HashMap();
 
@@ -3056,7 +3056,7 @@ class _InstanceCreationEvaluator {
     LibraryElementImpl library,
     AstNode node,
     ConstructorElementMixin constructor,
-    List<DartType>? typeArguments,
+    List<TypeImpl>? typeArguments,
     List<Expression> arguments,
     ConstantVisitor constantVisitor, {
     ConstructorInvocation? invocation,

pkg/analyzer/lib/src/dart/constant/value.dart

@@ -985,7 +985,7 @@ class DartObjectImpl implements DartObject, Constant {
   }
 
   @override
-  DartType? toTypeValue() {
+  TypeImpl? toTypeValue() {
     var state = this.state;
     if (state is TypeState) {
       return state._type;
@@ -999,7 +999,7 @@ class DartObjectImpl implements DartObject, Constant {
   DartObjectImpl typeInstantiate(
     TypeSystemImpl typeSystem,
     FunctionTypeImpl type,
-    List<DartType> typeArguments,
+    List<TypeImpl> typeArguments,
   ) {
     var functionState = state as FunctionState;
     return DartObjectImpl(
@@ -1356,7 +1356,7 @@ class FunctionState extends InstanceState {
   /// The element representing the function being modeled.
   final ExecutableElementImpl2 element;
 
-  final List<DartType>? typeArguments;
+  final List<TypeImpl>? typeArguments;
 
   /// The type alias which was referenced when tearing off a constructor,
   /// if this function is a constructor tear-off, referenced via a type alias,
@@ -2527,20 +2527,20 @@ class InvalidConstant implements Constant {
 
 /// The state of an object representing a list.
 class ListState extends InstanceState {
-  final DartType elementType;
+  final TypeImpl elementType;
   final List<DartObjectImpl> elements;
 
   @override
   final bool isUnknown;
 
   ListState({
-    required DartType elementType,
+    required TypeImpl elementType,
     required this.elements,
     this.isUnknown = false,
   }) : elementType = elementType.extensionTypeErasure;
 
   /// Creates a state that represents a list whose value is not known.
-  factory ListState.unknown(DartType elementType) =>
+  factory ListState.unknown(TypeImpl elementType) =>
       ListState(elementType: elementType, elements: [], isUnknown: true);
 
   @override
@@ -2620,9 +2620,9 @@ class ListState extends InstanceState {
 
 /// The state of an object representing a map.
 class MapState extends InstanceState {
-  final DartType _keyType;
+  final TypeImpl _keyType;
 
-  final DartType _valueType;
+  final TypeImpl _valueType;
 
   /// The entries in the map.
   final Map<DartObjectImpl, DartObjectImpl> entries;
@@ -2633,16 +2633,16 @@ class MapState extends InstanceState {
   /// Initializes a newly created state to represent a set with the given
   /// [entries].
   MapState({
-    required DartType keyType,
-    required DartType valueType,
+    required TypeImpl keyType,
+    required TypeImpl valueType,
     required this.entries,
     bool isUnknown = false,
   })  : _keyType = keyType.extensionTypeErasure,
         _valueType = valueType.extensionTypeErasure,
         _isUnknown = isUnknown;
 
   /// Creates a state that represents a map whose value is not known.
-  factory MapState.unknown(DartType keyType, DartType valueType) => MapState(
+  factory MapState.unknown(TypeImpl keyType, TypeImpl valueType) => MapState(
       keyType: keyType, valueType: valueType, entries: {}, isUnknown: true);
 
   @override
@@ -2923,7 +2923,7 @@ class RecordState extends InstanceState {
 
 /// The state of an object representing a set.
 class SetState extends InstanceState {
-  final DartType _elementType;
+  final TypeImpl _elementType;
 
   /// The elements of the set.
   final Set<DartObjectImpl> elements;
@@ -2934,14 +2934,14 @@ class SetState extends InstanceState {
   /// Initializes a newly created state to represent a set with the given
   /// [elements].
   SetState({
-    required DartType elementType,
+    required TypeImpl elementType,
     required this.elements,
     bool isUnknown = false,
   })  : _elementType = elementType.extensionTypeErasure,
         _isUnknown = isUnknown;
 
   /// Creates a state that represents a list whose value is not known.
-  factory SetState.unknown(DartType elementType) =>
+  factory SetState.unknown(TypeImpl elementType) =>
       SetState(elementType: elementType, elements: {}, isUnknown: true);
 
   @override
@@ -3158,9 +3158,9 @@ class SymbolState extends InstanceState {
 /// The state of an object representing a type.
 class TypeState extends InstanceState {
   /// The element representing the type being modeled.
-  final DartType? _type;
+  final TypeImpl? _type;
 
-  factory TypeState(DartType? type) {
+  factory TypeState(TypeImpl? type) {
     type = type?.extensionTypeErasure;
     return TypeState._(type);
   }