dart-lang
diff --git a/‎pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart‎
Lines changed: 19 additions & 10 deletions b/‎pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart‎
Lines changed: 19 additions & 10 deletions
diff --git a/‎pkg/analyzer/lib/src/generated/resolver.dart‎
Lines changed: 5 additions & 1 deletion b/‎pkg/analyzer/lib/src/generated/resolver.dart‎
Lines changed: 5 additions & 1 deletion
@@ -9,6 +9,7 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis.dart';
+import 'package:analyzer/src/generated/variable_type_provider.dart';
 
 /// The helper for performing flow analysis during resolution.
 ///
@@ -52,6 +53,10 @@ class FlowAnalysisHelper {
     this.assignedVariables,
   );
 
+  LocalVariableTypeProvider get localVariableTypeProvider {
+    return _LocalVariableTypeProvider(this);
+  }
+
   VariableElement assignmentExpression(AssignmentExpression node) {
     if (flow == null) return null;
 
@@ -253,11 +258,6 @@ class FlowAnalysisHelper {
         if (flow.isNonNullable(element)) {
           result.nonNullableNodes.add(node);
         }
-
-        var promotedType = flow.promotedType(element);
-        if (promotedType != null) {
-          result.promotedTypes[node] = promotedType;
-        }
       }
     }
   }
@@ -350,11 +350,6 @@ class FlowAnalysisResult {
   /// there is a `return` statement at the end of the function body block.
   final List<FunctionBody> functionBodiesThatDontComplete = [];
 
-  /// For each local variable or parameter, which type is promoted to a type
-  /// specific than its declaration type, this map included references where
-  /// the variable where it is read, and the type it has.
-  final Map<SimpleIdentifier, DartType> promotedTypes = {};
-
   void putIntoNode(AstNode node) {
     node.setProperty(_astKey, this);
   }
@@ -475,6 +470,20 @@ class _FunctionBodyAccess implements FunctionBodyAccess<VariableElement> {
   }
 }
 
+/// The flow analysis based implementation of [LocalVariableTypeProvider].
+class _LocalVariableTypeProvider implements LocalVariableTypeProvider {
+  final FlowAnalysisHelper _manager;
+
+  _LocalVariableTypeProvider(this._manager);
+
+  @override
+  DartType getType(SimpleIdentifier node) {
+    var variable = node.staticElement as VariableElement;
+    var promotedType = _manager.flow?.promotedType(variable);
+    return promotedType ?? variable.type;
+  }
+}
+
 class _NodeOperations implements NodeOperations<Expression> {
   @override
   Expression unwrapParenthesized(Expression node) {
 
@@ -3811,7 +3811,11 @@ class ResolverVisitor extends ScopedVisitor {
 
   /// Return the object providing promoted or declared types of variables.
   LocalVariableTypeProvider get localVariableTypeProvider {
-    return _promoteManager.localVariableTypeProvider;
+    if (_flowAnalysis != null) {
+      return _flowAnalysis.localVariableTypeProvider;
+    } else {
+      return _promoteManager.localVariableTypeProvider;
+    }
   }
 
   /// Return the static element associated with the given expression whose type