Version 2.12.0-108.0.dev

Merge commit 'ca5853779b4839a3bab54e49bfb2927b06394d06' into 'dev'

Author: Dart CI

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

@@ -1423,36 +1423,6 @@ class FlowModel<Variable, Type> {
     }
   }
 
-  /// Updates the state to indicate that variables that are not definitely
-  /// unassigned in the [other], are also not definitely unassigned in the
-  /// result.
-  FlowModel<Variable, Type> joinUnassigned(FlowModel<Variable, Type> other) {
-    Map<Variable, VariableModel<Variable, Type>> newVariableInfo;
-
-    void markNotUnassigned(Variable variable) {
-      VariableModel<Variable, Type> info = variableInfo[variable];
-      if (info == null) return;
-
-      VariableModel<Variable, Type> newInfo = info.markNotUnassigned();
-      if (identical(newInfo, info)) return;
-
-      (newVariableInfo ??=
-          new Map<Variable, VariableModel<Variable, Type>>.from(
-              variableInfo))[variable] = newInfo;
-    }
-
-    for (Variable variable in other.variableInfo.keys) {
-      VariableModel<Variable, Type> otherInfo = other.variableInfo[variable];
-      if (!otherInfo.unassigned) {
-        markNotUnassigned(variable);
-      }
-    }
-
-    if (newVariableInfo == null) return this;
-
-    return new FlowModel<Variable, Type>.withInfo(reachable, newVariableInfo);
-  }
-
   /// Updates the state to reflect a control path that is known to have
   /// previously passed through some [other] state.
   ///
@@ -2117,15 +2087,6 @@ class VariableModel<Variable, Type> {
         null, const [], true, false, writeCaptured);
   }
 
-  /// Returns a new [VariableModel] reflecting the fact that the variable is
-  /// not definitely unassigned.
-  VariableModel<Variable, Type> markNotUnassigned() {
-    if (!unassigned) return this;
-
-    return new VariableModel<Variable, Type>(
-        promotedTypes, tested, assigned, false, writeCaptured);
-  }
-
   /// Returns an updated model reflect a control path that is known to have
   /// previously passed through some [other] state.  See [FlowModel.restrict]
   /// for details.

pkg/_fe_analyzer_shared/test/flow_analysis/flow_analysis_test.dart

@@ -2674,68 +2674,6 @@ main() {
       });
     });
 
-    group('joinUnassigned', () {
-      group('other', () {
-        test('unchanged', () {
-          var h = Harness();
-
-          var a = Var('a', 'int');
-          var b = Var('b', 'int');
-
-          var s1 = FlowModel<Var, Type>(Reachability.initial)
-              .declare(a, false)
-              .declare(b, false)
-              .write(a, Type('int'), h);
-          expect(s1.variableInfo, {
-            a: _matchVariableModel(assigned: true, unassigned: false),
-            b: _matchVariableModel(assigned: false, unassigned: true),
-          });
-
-          var s2 = s1.write(a, Type('int'), h);
-          expect(s2.variableInfo, {
-            a: _matchVariableModel(assigned: true, unassigned: false),
-            b: _matchVariableModel(assigned: false, unassigned: true),
-          });
-
-          var s3 = s1.joinUnassigned(s2);
-          expect(s3, same(s1));
-        });
-
-        test('changed', () {
-          var h = Harness();
-
-          var a = Var('a', 'int');
-          var b = Var('b', 'int');
-          var c = Var('c', 'int');
-
-          var s1 = FlowModel<Var, Type>(Reachability.initial)
-              .declare(a, false)
-              .declare(b, false)
-              .declare(c, false)
-              .write(a, Type('int'), h);
-          expect(s1.variableInfo, {
-            a: _matchVariableModel(assigned: true, unassigned: false),
-            b: _matchVariableModel(assigned: false, unassigned: true),
-            c: _matchVariableModel(assigned: false, unassigned: true),
-          });
-
-          var s2 = s1.write(b, Type('int'), h);
-          expect(s2.variableInfo, {
-            a: _matchVariableModel(assigned: true, unassigned: false),
-            b: _matchVariableModel(assigned: true, unassigned: false),
-            c: _matchVariableModel(assigned: false, unassigned: true),
-          });
-
-          var s3 = s1.joinUnassigned(s2);
-          expect(s3.variableInfo, {
-            a: _matchVariableModel(assigned: true, unassigned: false),
-            b: _matchVariableModel(assigned: false, unassigned: false),
-            c: _matchVariableModel(assigned: false, unassigned: true),
-          });
-        });
-      });
-    });
-
     group('conservativeJoin', () {
       test('unchanged', () {
         var h = Harness();