[Flow analysis] Remove PropertyNotPromoted.staticType.

This field was only used to populate expectation strings in "id"
tests; it did not affect any user-visible behavior of the analyzer or
CFE.

Including information in "id" tests that doesn't affect any
user-visible behavior isn't helpful. Removing this field will enable
some upcoming flow analysis refactoring work (I intend to remove the
`ExpressionInfo._type` field, replacing its remaining usages with a
more reliable mechanism).

Change-Id: Id4c6593fae4ef25b8c21f0625e6c1f9eaa766e17
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406403
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Paul Berry <[email protected]>

Author: stereotype441

pkg/_fe_analyzer_shared/lib/src/flow_analysis/flow_analysis.dart

@@ -52,9 +52,8 @@ class DemoteViaExplicitWrite<Variable extends Object>
   String get shortName => 'explicitWrite';
 
   @override
-  R accept<R, Node extends Object, Variable extends Object,
-              Type extends Object>(
-          NonPromotionReasonVisitor<R, Node, Variable, Type> visitor) =>
+  R accept<R, Node extends Object, Variable extends Object>(
+          NonPromotionReasonVisitor<R, Node, Variable> visitor) =>
       visitor.visitDemoteViaExplicitWrite(
           this as DemoteViaExplicitWrite<Variable>);
 
@@ -2978,23 +2977,22 @@ abstract class NonPromotionReason {
   String get shortName;
 
   /// Implementation of the visitor pattern for non-promotion reasons.
-  R accept<R, Node extends Object, Variable extends Object,
-          Type extends Object>(
-      NonPromotionReasonVisitor<R, Node, Variable, Type> visitor);
+  R accept<R, Node extends Object, Variable extends Object>(
+      NonPromotionReasonVisitor<R, Node, Variable> visitor);
 }
 
 /// Implementation of the visitor pattern for non-promotion reasons.
 abstract class NonPromotionReasonVisitor<R, Node extends Object,
-    Variable extends Object, Type extends Object> {
+    Variable extends Object> {
   NonPromotionReasonVisitor._() : assert(false, 'Do not extend this class');
 
   R visitDemoteViaExplicitWrite(DemoteViaExplicitWrite<Variable> reason);
 
   R visitPropertyNotPromotedForInherentReason(
-      PropertyNotPromotedForInherentReason<Type> reason);
+      PropertyNotPromotedForInherentReason reason);
 
   R visitPropertyNotPromotedForNonInherentReason(
-      PropertyNotPromotedForNonInherentReason<Type> reason);
+      PropertyNotPromotedForNonInherentReason reason);
 
   R visitThisNotPromoted(ThisNotPromoted reason);
 }
@@ -3624,37 +3622,30 @@ class PromotionModel<Type extends Object> {
 
 /// Non-promotion reason describing the situation where an expression was not
 /// promoted due to the fact that it's a property get.
-abstract base class PropertyNotPromoted<Type extends Object>
-    extends NonPromotionReason {
+abstract base class PropertyNotPromoted extends NonPromotionReason {
   /// The name of the property.
   final String propertyName;
 
   /// The field or property being accessed.  This matches a `propertyMember`
   /// value that was passed to [FlowAnalysis.propertyGet].
   final Object? propertyMember;
 
-  /// The static type of the property at the time of the access.  This is the
-  /// type that was passed to [FlowAnalysis.whyNotPromoted]; it is provided to
-  /// the client as a convenience for ID testing.
-  final Type staticType;
-
   /// Whether field promotion is enabled for the current library.
   final bool fieldPromotionEnabled;
 
-  PropertyNotPromoted(this.propertyName, this.propertyMember, this.staticType,
+  PropertyNotPromoted(this.propertyName, this.propertyMember,
       {required this.fieldPromotionEnabled});
 }
 
 /// Non-promotion reason describing the situation where an expression was not
 /// promoted due to the fact that it's a property get, and the target of the
 /// property get is something inherently non-promotable.
-final class PropertyNotPromotedForInherentReason<Type extends Object>
-    extends PropertyNotPromoted<Type> {
+final class PropertyNotPromotedForInherentReason extends PropertyNotPromoted {
   /// The reason why the property isn't promotable.
   final PropertyNonPromotabilityReason whyNotPromotable;
 
-  PropertyNotPromotedForInherentReason(super.propertyName, super.propertyMember,
-      super.staticType, this.whyNotPromotable,
+  PropertyNotPromotedForInherentReason(
+      super.propertyName, super.propertyMember, this.whyNotPromotable,
       {required super.fieldPromotionEnabled});
 
   @override
@@ -3674,11 +3665,9 @@ final class PropertyNotPromotedForInherentReason<Type extends Object>
   String get shortName => 'propertyNotPromotedForInherentReason';
 
   @override
-  R accept<R, Node extends Object, Variable extends Object,
-              Type extends Object>(
-          NonPromotionReasonVisitor<R, Node, Variable, Type> visitor) =>
-      visitor.visitPropertyNotPromotedForInherentReason(
-          this as PropertyNotPromotedForInherentReason<Type>);
+  R accept<R, Node extends Object, Variable extends Object>(
+          NonPromotionReasonVisitor<R, Node, Variable> visitor) =>
+      visitor.visitPropertyNotPromotedForInherentReason(this);
 }
 
 /// Non-promotion reason describing the situation where an expression was not
@@ -3698,10 +3687,10 @@ final class PropertyNotPromotedForInherentReason<Type extends Object>
 /// promotion being disabled. So this class is used for both scenarios; it is up
 /// to the client to determine the correct non-promotion reason to report to the
 /// user.
-final class PropertyNotPromotedForNonInherentReason<Type extends Object>
-    extends PropertyNotPromoted<Type> {
+final class PropertyNotPromotedForNonInherentReason
+    extends PropertyNotPromoted {
   PropertyNotPromotedForNonInherentReason(
-      super.propertyName, super.propertyMember, super.staticType,
+      super.propertyName, super.propertyMember,
       {required super.fieldPromotionEnabled});
 
   @override
@@ -3711,11 +3700,9 @@ final class PropertyNotPromotedForNonInherentReason<Type extends Object>
   String get shortName => 'PropertyNotPromotedForNonInherentReason';
 
   @override
-  R accept<R, Node extends Object, Variable extends Object,
-              Type extends Object>(
-          NonPromotionReasonVisitor<R, Node, Variable, Type> visitor) =>
-      visitor.visitPropertyNotPromotedForNonInherentReason(
-          this as PropertyNotPromotedForNonInherentReason<Type>);
+  R accept<R, Node extends Object, Variable extends Object>(
+          NonPromotionReasonVisitor<R, Node, Variable> visitor) =>
+      visitor.visitPropertyNotPromotedForNonInherentReason(this);
 }
 
 /// Target for a property access that might undergo promotion.
@@ -4115,9 +4102,8 @@ class ThisNotPromoted extends NonPromotionReason {
   String get shortName => 'thisNotPromoted';
 
   @override
-  R accept<R, Node extends Object, Variable extends Object,
-              Type extends Object>(
-          NonPromotionReasonVisitor<R, Node, Variable, Type> visitor) =>
+  R accept<R, Node extends Object, Variable extends Object>(
+          NonPromotionReasonVisitor<R, Node, Variable> visitor) =>
       visitor.visitThisNotPromoted(this);
 }
 
@@ -5924,12 +5910,11 @@ class _FlowAnalysisImpl<Node extends Object, Statement extends Node,
               for (Type type in previouslyPromotedTypes) {
                 result[type] = whyNotPromotable == null
                     ? new PropertyNotPromotedForNonInherentReason(
-                        reference.propertyName, propertyMember, reference._type,
+                        reference.propertyName, propertyMember,
                         fieldPromotionEnabled: fieldPromotionEnabled)
                     : new PropertyNotPromotedForInherentReason(
                         reference.propertyName,
                         propertyMember,
-                        reference._type,
                         whyNotPromotable,
                         fieldPromotionEnabled: fieldPromotionEnabled);
               }

pkg/_fe_analyzer_shared/test/flow_analysis/flow_analysis_test.dart

@@ -11514,9 +11514,8 @@ class _MockNonPromotionReason extends NonPromotionReason {
   String get shortName => fail('Unexpected call to shortName');
 
   @override
-  R accept<R, Node extends Object, Variable extends Object,
-              Type extends Object>(
-          NonPromotionReasonVisitor<R, Node, Variable, Type> visitor) =>
+  R accept<R, Node extends Object, Variable extends Object>(
+          NonPromotionReasonVisitor<R, Node, Variable> visitor) =>
       fail('Unexpected call to accept');
 }