Sema: Preserve insertion order in Solution::typeBindings

Author: slavapestov

include/swift/Sema/ConstraintSystem.h

@@ -1497,7 +1497,7 @@ class Solution {
   DeclContext *getDC() const;
 
   /// The set of type bindings.
-  llvm::DenseMap<TypeVariableType *, Type> typeBindings;
+  llvm::MapVector<TypeVariableType *, Type> typeBindings;
 
   /// The set of overload choices along with their types.
   llvm::DenseMap<ConstraintLocator *, SelectedOverload> overloadChoices;

lib/IDE/KeyPathCompletion.cpp

@@ -53,7 +53,7 @@ void KeyPathTypeCheckCompletionCallback::sawSolutionImpl(
             return Entry.first->getImpl().getLocator() == RootLocator;
           });
       if (BaseVariableTypeBinding != S.typeBindings.end()) {
-        BaseType = S.simplifyType(BaseVariableTypeBinding->getSecond());
+        BaseType = S.simplifyType(BaseVariableTypeBinding->second);
       }
     }
   } else {

lib/Sema/ConstraintSystem.cpp

@@ -1872,7 +1872,7 @@ size_t Solution::getTotalMemory() const {
     return *TotalMemory;
 
   const_cast<Solution *>(this)->TotalMemory
-       = sizeof(*this) + typeBindings.getMemorySize() +
+       = sizeof(*this) + size_in_bytes(typeBindings) +
          overloadChoices.getMemorySize() +
          ConstraintRestrictions.getMemorySize() +
          (Fixes.size() * sizeof(void *)) + DisjunctionChoices.getMemorySize() +