Flow analysis: register loop variables with add().

stereotype441 · commit-bot@chromium.org · commit da5864716165 · 2019-07-22T17:23:28.000Z
Change-Id: I321e3ec9b6413028b78bfa36c3022ef70447f745 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109762 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_visitor.dart b/pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart
@@ -241,6 +241,12 @@ class FlowAnalysisHelper {
     return false;
   }
 
+  void loopVariable(DeclaredIdentifier loopVariable) {
+    if (loopVariable != null) {
+      flow.add(loopVariable.declaredElement, assigned: true);
+    }
+  }
+
   void variableDeclarationStatement(VariableDeclarationStatement node) {
     var variables = node.variables.variables;
     for (var i = 0; i < variables.length; ++i) {
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -4568,6 +4568,7 @@ class ResolverVisitor extends ScopedVisitor {
       // cannot be in scope while visiting the iterator.
       //
       iterable?.accept(this);
+      _flowAnalysis?.loopVariable(loopVariable);
       loopVariable?.accept(this);
 
       _flowAnalysis?.flow?.forEachStatement_bodyBegin(
