Update

clang/include/clang/AST/DeclID.h

@@ -17,6 +17,7 @@
 #define LLVM_CLANG_AST_DECLID_H
 
 #include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/iterator.h"
 
 #include <climits>
@@ -233,8 +234,8 @@ template <> struct DenseMapInfo<clang::GlobalDeclID> {
     // Our default hash algorithm for 64 bits integer may not be very good.
     // In GlobalDeclID's case, it is pretty common that the lower 32 bits can
     // be same.
-    return DenseMapInfo<uint32_t>::getHashValue(Key.getModuleFileIndex()) ^
-           DenseMapInfo<uint32_t>::getHashValue(Key.getLocalDeclIndex());
+    // FIXME: Remove this when we fix the underlying issue.
+    return llvm::hash_value(Key.get());
   }
 
   static bool isEqual(const GlobalDeclID &L, const GlobalDeclID &R) {