Flow analysis: Remove "emptySet" argument from markNonNullable

stereotype441 · commit-bot@chromium.org · commit 7adca0ec5fa9 · 2019-07-22T15:36:48.000Z
Change-Id: Ia2fd7878badedba95ffee5f7a6948402376a2300 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109882 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/flow_analysis.dart b/pkg/analyzer/lib/src/dart/resolver/flow_analysis.dart
@@ -180,8 +180,7 @@ class FlowAnalysis<Statement, Expression, Variable, Type> {
 
     _condition = binaryExpression;
     _conditionTrue = _current;
-    _conditionFalse =
-        _current.markNonNullable(typeOperations, _emptySet, variable);
+    _conditionFalse = _current.markNonNullable(typeOperations, variable);
   }
 
   /// The [binaryExpression] checks that the [variable] is not equal to `null`.
@@ -191,8 +190,7 @@ class FlowAnalysis<Statement, Expression, Variable, Type> {
     }
 
     _condition = binaryExpression;
-    _conditionTrue =
-        _current.markNonNullable(typeOperations, _emptySet, variable);
+    _conditionTrue = _current.markNonNullable(typeOperations, variable);
     _conditionFalse = _current;
   }
 
@@ -683,9 +681,7 @@ class State<Variable, Type> {
   }
 
   State<Variable, Type> markNonNullable(
-      TypeOperations<Variable, Type> typeOperations,
-      _VariableSet<Variable> emptySet,
-      Variable variable) {
+      TypeOperations<Variable, Type> typeOperations, Variable variable) {
     var previousType = promoted[variable];
     previousType ??= typeOperations.variableType(variable);
     var type = typeOperations.tryPromoteToNonNull(previousType);
diff --git a/pkg/analyzer/test/src/dart/resolution/flow_analysis_unit_test.dart b/pkg/analyzer/test/src/dart/resolution/flow_analysis_unit_test.dart
@@ -246,14 +246,14 @@ main() {
       test('unpromoted -> unchanged', () {
         var h = _Harness();
         var s1 = State<_Var, _Type>(true).add(intVar);
-        var s2 = s1.markNonNullable(h, emptySet, intVar);
+        var s2 = s1.markNonNullable(h, intVar);
         expect(s2, same(s1));
       });
 
       test('unpromoted -> promoted', () {
         var h = _Harness();
         var s1 = State<_Var, _Type>(true).add(intQVar);
-        var s2 = s1.markNonNullable(h, emptySet, intQVar);
+        var s2 = s1.markNonNullable(h, intQVar);
         expect(s2.reachable, true);
         expect(s2.notAssigned, same(s1.notAssigned));
         expect(s2.promoted[intQVar].type, 'int');
@@ -264,7 +264,7 @@ main() {
         var s1 = State<_Var, _Type>(true)
             .add(objectQVar)
             .promote(h, objectQVar, _Type('int'));
-        var s2 = s1.markNonNullable(h, emptySet, objectQVar);
+        var s2 = s1.markNonNullable(h, objectQVar);
         expect(s2, same(s1));
       });
 
@@ -273,7 +273,7 @@ main() {
         var s1 = State<_Var, _Type>(true)
             .add(objectQVar)
             .promote(h, objectQVar, _Type('int?'));
-        var s2 = s1.markNonNullable(h, emptySet, objectQVar);
+        var s2 = s1.markNonNullable(h, objectQVar);
         expect(s2.reachable, true);
         expect(s2.notAssigned, same(s1.notAssigned));
         _Type.allowComparisons(() {

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,7 @@ class FlowAnalysis<Statement, Expression, Variable, Type> {`
`180`	`180`
`181`	`181`	`_condition = binaryExpression;`
`182`	`182`	`_conditionTrue = _current;`
`183`		`- _conditionFalse =`
`184`		`- _current.markNonNullable(typeOperations, _emptySet, variable);`
	`183`	`+ _conditionFalse = _current.markNonNullable(typeOperations, variable);`
`185`	`184`	`}`
`186`	`185`
`187`	`186`	/// The [binaryExpression] checks that the [variable] is not equal to `null`.
`@@ -191,8 +190,7 @@ class FlowAnalysis<Statement, Expression, Variable, Type> {`
`191`	`190`	`}`
`192`	`191`
`193`	`192`	`_condition = binaryExpression;`
`194`		`- _conditionTrue =`
`195`		`- _current.markNonNullable(typeOperations, _emptySet, variable);`
	`193`	`+ _conditionTrue = _current.markNonNullable(typeOperations, variable);`
`196`	`194`	`_conditionFalse = _current;`
`197`	`195`	`}`
`198`	`196`
`@@ -683,9 +681,7 @@ class State<Variable, Type> {`
`683`	`681`	`}`
`684`	`682`
`685`	`683`	`State<Variable, Type> markNonNullable(`
`686`		`- TypeOperations<Variable, Type> typeOperations,`
`687`		`- _VariableSet<Variable> emptySet,`
`688`		`- Variable variable) {`
	`684`	`+ TypeOperations<Variable, Type> typeOperations, Variable variable) {`
`689`	`685`	`var previousType = promoted[variable];`
`690`	`686`	`previousType ??= typeOperations.variableType(variable);`
`691`	`687`	`var type = typeOperations.tryPromoteToNonNull(previousType);`