analyzer: look at element types for const sets and maps

Fixes #54356

Change-Id: Iee17d4aee3173db9747cdd9c9a0cc4203abab226
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/400802
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

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

@@ -1013,13 +1013,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             : _typeProvider.dynamicType;
     var listType = _typeProvider.listType(elementType);
     var list = <DartObjectImpl>[];
-    return _buildListConstant(
-      list,
-      node.elements,
-      typeSystem,
-      listType,
-      elementType,
-    );
+    return _buildListConstant(list, node.elements, typeSystem, listType);
   }
 
   @override
@@ -1364,8 +1358,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     List<DartObjectImpl> list,
     List<CollectionElement> elements,
     TypeSystemImpl typeSystem,
-    DartType listType,
-    DartType elementType,
+    InterfaceType listType,
   ) {
     for (var element in elements) {
       switch (element) {
@@ -1388,11 +1381,9 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             case DartObjectImpl():
               // If the condition is unknown, we mark this list as unknown.
               if (condition.isUnknown) {
-                return DartObjectImpl.validWithUnknownValue(
-                  typeSystem,
-                  listType,
-                  listElementType: elementType,
-                );
+                var elementType = listType.typeArguments.first;
+                return DartObjectImpl(
+                    typeSystem, listType, ListState.unknown(elementType));
               }
               var conditionValue = condition.toBoolValue();
               Constant? branchResult;
@@ -1401,20 +1392,10 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
                     CompileTimeErrorCode.NON_BOOL_CONDITION);
               } else if (conditionValue) {
                 branchResult = _buildListConstant(
-                  list,
-                  [element.thenElement],
-                  typeSystem,
-                  listType,
-                  elementType,
-                );
+                    list, [element.thenElement], typeSystem, listType);
               } else if (element.elseElement != null) {
                 branchResult = _buildListConstant(
-                  list,
-                  [element.elseElement!],
-                  typeSystem,
-                  listType,
-                  elementType,
-                );
+                    list, [element.elseElement!], typeSystem, listType);
               }
               if (branchResult is InvalidConstant) {
                 return branchResult;
@@ -1450,25 +1431,15 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
                 continue;
               }
               var result = _buildListConstant(
-                list,
-                [element.value],
-                typeSystem,
-                listType,
-                elementType,
-              );
+                  list, [element.value], typeSystem, listType);
               return result;
           }
       }
     }
 
-    return DartObjectImpl(
-      typeSystem,
-      listType,
-      ListState(
-        elementType: elementType,
-        elements: list,
-      ),
-    );
+    var elementType = listType.typeArguments.first;
+    return DartObjectImpl(typeSystem, listType,
+        ListState(elementType: elementType, elements: list));
   }
 
   /// Builds a map constant by adding the evaluated entries of [elements] to
@@ -1478,10 +1449,11 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   /// We return an [InvalidConstant] if the evaluation of any of the elements
   /// failed.
   Constant _buildMapConstant(
-      Map<DartObjectImpl, DartObjectImpl> map,
-      List<CollectionElement> elements,
-      TypeSystemImpl typeSystem,
-      DartType mapType) {
+    Map<DartObjectImpl, DartObjectImpl> map,
+    List<CollectionElement> elements,
+    TypeSystemImpl typeSystem,
+    InterfaceType mapType,
+  ) {
     for (var element in elements) {
       switch (element) {
         case Expression():
@@ -1498,8 +1470,10 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             case DartObjectImpl():
               // If the condition is unknown, we mark this map as unknown.
               if (condition.isUnknown) {
-                return DartObjectImpl.validWithUnknownValue(
-                    typeSystem, mapType);
+                var keyType = mapType.typeArguments[0];
+                var valueType = mapType.typeArguments[1];
+                return DartObjectImpl(
+                    typeSystem, mapType, MapState.unknown(keyType, valueType));
               }
               Constant? branchResult;
               var conditionValue = condition.toBoolValue();
@@ -1556,7 +1530,10 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       }
     }
 
-    return DartObjectImpl(typeSystem, mapType, MapState(map));
+    var keyType = mapType.typeArguments[0];
+    var valueType = mapType.typeArguments[1];
+    return DartObjectImpl(typeSystem, mapType,
+        MapState(keyType: keyType, valueType: valueType, entries: map));
   }
 
   /// Builds a set constant by adding the evaluated entries of [elements] to
@@ -1566,10 +1543,11 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   /// We return an [InvalidConstant] if the evaluation of any of the elements
   /// failed.
   Constant _buildSetConstant(
-      Set<DartObjectImpl> set,
-      List<CollectionElement> elements,
-      TypeSystemImpl typeSystem,
-      DartType setType) {
+    Set<DartObjectImpl> set,
+    List<CollectionElement> elements,
+    TypeSystemImpl typeSystem,
+    InterfaceType setType,
+  ) {
     for (var element in elements) {
       switch (element) {
         case Expression():
@@ -1591,8 +1569,9 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             case DartObjectImpl():
               // If the condition is unknown, we mark this set as unknown.
               if (condition.isUnknown) {
-                return DartObjectImpl.validWithUnknownValue(
-                    typeSystem, setType);
+                var elementType = setType.typeArguments.first;
+                return DartObjectImpl(
+                    typeSystem, setType, SetState.unknown(elementType));
               }
               Constant? branchResult;
               var conditionValue = condition.toBoolValue();
@@ -1646,7 +1625,9 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       }
     }
 
-    return DartObjectImpl(typeSystem, setType, SetState(set));
+    var elementType = setType.typeArguments.first;
+    return DartObjectImpl(
+        typeSystem, setType, SetState(elementType: elementType, elements: set));
   }
 
   /// Returns the result of concatenating [astNodes].

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

@@ -211,24 +211,26 @@ class DartObjectImpl implements DartObject, Constant {
 
   /// Create an object to represent an unknown value.
   factory DartObjectImpl.validWithUnknownValue(
-      TypeSystemImpl typeSystem, DartType type,
-      {DartType? listElementType}) {
+      TypeSystemImpl typeSystem, DartType type) {
     if (type.isDartCoreBool) {
       return DartObjectImpl(typeSystem, type, BoolState.UNKNOWN_VALUE);
     } else if (type.isDartCoreDouble) {
       return DartObjectImpl(typeSystem, type, DoubleState.UNKNOWN_VALUE);
     } else if (type.isDartCoreInt) {
       return DartObjectImpl(typeSystem, type, IntState.UNKNOWN_VALUE);
     } else if (type.isDartCoreList) {
-      return DartObjectImpl(
-          typeSystem,
-          type,
-          ListState.unknown(
-              listElementType ?? typeSystem.typeProvider.dynamicType));
+      return DartObjectImpl(typeSystem, type,
+          ListState.unknown(typeSystem.typeProvider.dynamicType));
     } else if (type.isDartCoreMap) {
-      return DartObjectImpl(typeSystem, type, MapState.UNKNOWN);
+      return DartObjectImpl(
+        typeSystem,
+        type,
+        MapState.unknown(typeSystem.typeProvider.dynamicType,
+            typeSystem.typeProvider.dynamicType),
+      );
     } else if (type.isDartCoreSet) {
-      return DartObjectImpl(typeSystem, type, SetState.UNKNOWN);
+      return DartObjectImpl(typeSystem, type,
+          SetState.unknown(typeSystem.typeProvider.dynamicType));
     } else if (type.isDartCoreString) {
       return DartObjectImpl(typeSystem, type, StringState.UNKNOWN_VALUE);
     }
@@ -2529,29 +2531,16 @@ class ListState extends InstanceState {
   @override
   final bool isUnknown;
 
-  factory ListState({
+  ListState({
     required DartType elementType,
-    required List<DartObjectImpl> elements,
-    bool isUnknown = false,
-  }) {
-    elementType = elementType.extensionTypeErasure;
-    return ListState._(
-      elementType: elementType,
-      elements: elements,
-      isUnknown: isUnknown,
-    );
-  }
+    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) =>
       ListState(elementType: elementType, elements: [], isUnknown: true);
 
-  ListState._({
-    required this.elementType,
-    required this.elements,
-    required this.isUnknown,
-  });
-
   @override
   int get hashCode {
     int value = 0;
@@ -2629,18 +2618,30 @@ class ListState extends InstanceState {
 
 /// The state of an object representing a map.
 class MapState extends InstanceState {
-  /// A state that represents a map whose value is not known.
-  static MapState UNKNOWN = MapState({}, isUnknown: true);
+  final DartType _keyType;
+
+  final DartType _valueType;
 
   /// The entries in the map.
   final Map<DartObjectImpl, DartObjectImpl> entries;
 
   /// Whether the map contains an entry that has an unknown value.
   final bool _isUnknown;
 
-  /// Initializes a newly created state to represent a map with the given
+  /// Initializes a newly created state to represent a set with the given
   /// [entries].
-  MapState(this.entries, {bool isUnknown = false}) : _isUnknown = isUnknown;
+  MapState({
+    required DartType keyType,
+    required DartType 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(
+      keyType: keyType, valueType: valueType, entries: {}, isUnknown: true);
 
   @override
   int get hashCode {
@@ -2695,7 +2696,14 @@ class MapState extends InstanceState {
     if (isUnknown || rightOperand.isUnknown) {
       return BoolState.UNKNOWN_VALUE;
     }
-    return BoolState.from(this == rightOperand);
+    if (rightOperand is! MapState) {
+      return BoolState.FALSE_STATE;
+    }
+    return BoolState.from(typeSystem.normalize(_keyType) ==
+            typeSystem.normalize(rightOperand._keyType) &&
+        typeSystem.normalize(_valueType) ==
+            typeSystem.normalize(rightOperand._valueType) &&
+        this == rightOperand);
   }
 
   @override
@@ -2913,8 +2921,7 @@ class RecordState extends InstanceState {
 
 /// The state of an object representing a set.
 class SetState extends InstanceState {
-  /// A state that represents a set whose value is not known.
-  static SetState UNKNOWN = SetState({}, isUnknown: true);
+  final DartType _elementType;
 
   /// The elements of the set.
   final Set<DartObjectImpl> elements;
@@ -2924,7 +2931,16 @@ class SetState extends InstanceState {
 
   /// Initializes a newly created state to represent a set with the given
   /// [elements].
-  SetState(this.elements, {bool isUnknown = false}) : _isUnknown = isUnknown;
+  SetState({
+    required DartType 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) =>
+      SetState(elementType: elementType, elements: {}, isUnknown: true);
 
   @override
   int get hashCode {
@@ -2978,7 +2994,12 @@ class SetState extends InstanceState {
     if (isUnknown || rightOperand.isUnknown) {
       return BoolState.UNKNOWN_VALUE;
     }
-    return BoolState.from(this == rightOperand);
+    if (rightOperand is! SetState) {
+      return BoolState.FALSE_STATE;
+    }
+    return BoolState.from(typeSystem.normalize(_elementType) ==
+            typeSystem.normalize(rightOperand._elementType) &&
+        this == rightOperand);
   }
 
   @override