Respond to changes in SetVector in r253439.

Author: gottesmm

include/swift/AST/CaptureInfo.h

@@ -18,8 +18,13 @@
 #include "llvm/ADT/PointerIntPair.h"
 #include <vector>
 
+namespace swift {
+class CapturedValue;
+}
+
 namespace llvm {
 class raw_ostream;
+template <> struct DenseMapInfo<swift::CapturedValue>;
 }
 
 namespace swift {
@@ -30,7 +35,12 @@ class FuncDecl;
 /// that indicate how it is captured.
 class CapturedValue {
   llvm::PointerIntPair<ValueDecl*, 2, unsigned> Value;
+
+  explicit CapturedValue(llvm::PointerIntPair<ValueDecl*, 2, unsigned> V) : Value(V) {}
+
 public:
+  friend struct llvm::DenseMapInfo<CapturedValue>;
+
   enum {
     /// IsDirect is set when a VarDecl with storage *and* accessors is captured
     /// by its storage address.  This happens in the accessors for the VarDecl.
@@ -64,7 +74,36 @@ class CapturedValue {
   }
 };
 
+} // end swift namespace
 
+namespace llvm {
+
+template <> struct DenseMapInfo<swift::CapturedValue> {
+  using CapturedValue = swift::CapturedValue;
+
+  using PtrIntPairDenseMapInfo =
+      DenseMapInfo<llvm::PointerIntPair<swift::ValueDecl *, 2, unsigned>>;
+
+  static inline swift::CapturedValue getEmptyKey() {
+    return CapturedValue{PtrIntPairDenseMapInfo::getEmptyKey()};
+  }
+
+  static inline CapturedValue getTombstoneKey() {
+    return CapturedValue{PtrIntPairDenseMapInfo::getTombstoneKey()};
+  }
+
+  static unsigned getHashValue(const CapturedValue &Val) {
+    return PtrIntPairDenseMapInfo::getHashValue(Val.Value);
+  }
+
+  static bool isEqual(const CapturedValue &LHS, const CapturedValue &RHS) {
+    return PtrIntPairDenseMapInfo::isEqual(LHS.Value, RHS.Value);
+  }
+};
+
+} // end llvm namespace
+
+namespace swift {
 
 /// \brief Stores information about captured variables.
 class CaptureInfo {

include/swift/AST/ModuleLoader.h

@@ -34,7 +34,8 @@ enum class KnownProtocolKind : uint8_t;
 
 /// Records dependencies on files outside of the current module.
 class DependencyTracker {
-  llvm::SetVector<std::string, std::vector<std::string>> paths;
+  llvm::SetVector<std::string, std::vector<std::string>,
+                  llvm::SmallSet<std::string, 16>> paths;
 
 public:
   /// Adds a file as a dependency.

lib/AST/LookupVisibleDecls.cpp

@@ -519,6 +519,7 @@ static void lookupVisibleMemberDeclsImpl(
 }
 
 namespace {
+
 struct FoundDeclTy {
   ValueDecl *D;
   DeclVisibilityKind Reason;
@@ -535,6 +536,33 @@ struct FoundDeclTy {
   }
 };
 
+} // end anonymous namespace
+
+namespace llvm {
+
+template <> struct DenseMapInfo<FoundDeclTy> {
+  static inline FoundDeclTy getEmptyKey() {
+    return FoundDeclTy{nullptr, DeclVisibilityKind::LocalVariable};
+  }
+
+  static inline FoundDeclTy getTombstoneKey() {
+    return FoundDeclTy{reinterpret_cast<ValueDecl *>(0x1),
+                       DeclVisibilityKind::LocalVariable};
+  }
+
+  static unsigned getHashValue(const FoundDeclTy &Val) {
+    return llvm::hash_combine(unsigned(Val.Reason), Val.D);
+  }
+
+  static bool isEqual(const FoundDeclTy &LHS, const FoundDeclTy &RHS) {
+    return LHS == RHS;
+  }
+};
+
+} // end llvm namespace
+
+namespace {
+
 /// Similar to swift::conflicting, but lenient about protocol extensions which
 /// don't affect code completion's concept of overloading.
 static bool relaxedConflicting(const OverloadSignature &sig1,