Flow analysis: Remove hack preventing variables showing as both nullable and non-nullable.

stereotype441 · commit-bot@chromium.org · commit 0faa3b715397 · 2019-07-20T05:01:43.000Z
It's better to annotate the test to match the way the code is truly behaving, and include TODO comments indicating what needs to be changed, because then when we make the fix we'll be able to see the behavioral difference in the diff. Change-Id: I28faad5787f8c70d3b5f5d8fc3510b0e3fb294f2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109741 Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart b/pkg/analyzer/test/src/dart/resolution/flow_analysis_test.dart
@@ -371,10 +371,13 @@ void f(bool b, int i) {
   /*stmt: unreachable*/ do {} while (b);
   /*stmt: unreachable*/ for (;;) {}
   /*stmt: unreachable*/ for (var _ in []) {}
-  /*stmt: unreachable*/ if (b) {}
-  /*stmt: unreachable*/ switch (i) {}
+  // TODO(paulberry): b shouldn't be considered both nullable and non-nullable.
+  /*stmt: unreachable*/ if (/*nonNullable,nullable*/b) {}
+  // TODO(paulberry): i shouldn't be considered both nullable and non-nullable.
+  /*stmt: unreachable*/ switch (/*nonNullable,nullable*/i) {}
   /*stmt: unreachable*/ try {} finally {}
-  /*stmt: unreachable*/ while (b) {}
+  // TODO(paulberry): b shouldn't be considered both nullable and non-nullable.
+  /*stmt: unreachable*/ while (/*nonNullable,nullable*/b) {}
 }
 ''');
   }
@@ -485,15 +488,17 @@ void f() {
   test_logicalAnd_leftFalse() async {
     await trackCode(r'''
 void f(int x) {
-  false && /*unreachable*/ (x == 1);
+  // TODO(paulberry): x shouldn't be considered both nullable and non-nullable.
+  false && /*unreachable*/ (/*nonNullable,nullable*/x == 1);
 }
 ''');
   }
 
   test_logicalOr_leftTrue() async {
     await trackCode(r'''
 void f(int x) {
-  true || /*unreachable*/ (x == 1);
+  // TODO(paulberry): x shouldn't be considered both nullable and non-nullable.
+  true || /*unreachable*/ (/*nonNullable,nullable*/x == 1);
 }
 ''');
   }
@@ -717,18 +722,10 @@ class _FlowAnalysisDataExtractor extends AstDataExtractor<Set<_FlowAssertion>> {
   Set<_FlowAssertion> computeNodeValue(Id id, AstNode node) {
     Set<_FlowAssertion> result = {};
     if (_flowResult.nullableNodes.contains(node)) {
-      // We sometimes erroneously annotate a node as both nullable and
-      // non-nullable.  Ignore for now.  TODO(paulberry): fix this.
-      if (!_flowResult.nonNullableNodes.contains(node)) {
-        result.add(_FlowAssertion.nullable);
-      }
+      result.add(_FlowAssertion.nullable);
     }
     if (_flowResult.nonNullableNodes.contains(node)) {
-      // We sometimes erroneously annotate a node as both nullable and
-      // non-nullable.  Ignore for now.  TODO(paulberry): fix this.
-      if (!_flowResult.nullableNodes.contains(node)) {
-        result.add(_FlowAssertion.nonNullable);
-      }
+      result.add(_FlowAssertion.nonNullable);
     }
     if (_flowResult.unreachableNodes.contains(node)) {
       result.add(_FlowAssertion.unreachable);
