From 148436035be34390532300b58a6701ae51142322 Mon Sep 17 00:00:00 2001
From: Greg Titus <gregomni@gmail.com>
Date: Sat, 13 Jun 2020 12:47:34 -0700
Subject: [PATCH] CS node->type map requires ordering because it can be
 partially undone, but Solution node->type map is all or nothing, so can be
 cheaper.

---
 lib/Sema/ConstraintSystem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Sema/ConstraintSystem.h b/lib/Sema/ConstraintSystem.h
index 4c93b2ef74571..0263164b986df 100644
--- a/lib/Sema/ConstraintSystem.h
+++ b/lib/Sema/ConstraintSystem.h
@@ -1016,7 +1016,7 @@ class Solution {
   llvm::SmallPtrSet<ConstraintLocator *, 2> DefaultedConstraints;
 
   /// The node -> type mappings introduced by this solution.
-  llvm::MapVector<ASTNode, Type> nodeTypes;
+  llvm::DenseMap<ASTNode, Type> nodeTypes;
 
   /// Contextual types introduced by this solution.
   std::vector<std::pair<ASTNode, ContextualTypeInfo>> contextualTypes;