[nnbd_migration] Handle do while

MichaelRFairhurst · commit-bot@chromium.org · commit 689388525cd0 · 2019-08-08T21:46:02.000Z
Change-Id: I97071b6b59c9450fddcf7f3ea2da19c99bff4682 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112407 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Mike Fairhurst <mfairhurst@google.com>
diff --git a/pkg/nnbd_migration/lib/src/edge_builder.dart b/pkg/nnbd_migration/lib/src/edge_builder.dart
@@ -419,6 +419,13 @@ class EdgeBuilder extends GeneralizingAstVisitor<DecoratedType>
     return null;
   }
 
+  @override
+  DecoratedType visitDoStatement(DoStatement node) {
+    node.body.accept(this);
+    _handleAssignment(node.condition, _notNullType);
+    return null;
+  }
+
   @override
   DecoratedType visitDoubleLiteral(DoubleLiteral node) {
     return DecoratedType(node.staticType, _graph.never);
diff --git a/pkg/nnbd_migration/test/edge_builder_test.dart b/pkg/nnbd_migration/test/edge_builder_test.dart
@@ -1335,6 +1335,17 @@ class C {
         hard: true);
   }
 
+  test_do_while_condition() async {
+    await analyze('''
+void f(bool b) {
+  do {} while (b);
+}
+''');
+
+    assertNullCheck(checkExpression('b);'),
+        assertEdge(decoratedTypeAnnotation('bool b').node, never, hard: true));
+  }
+
   test_doubleLiteral() async {
     await analyze('''
 double f() {
