Index: clang-tools-extra/trunk/clangd/SourceCode.h =================================================================== --- clang-tools-extra/trunk/clangd/SourceCode.h +++ clang-tools-extra/trunk/clangd/SourceCode.h @@ -22,7 +22,6 @@ #include "clang/Tooling/Core/Replacement.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Support/SHA1.h" namespace clang { class SourceManager; @@ -32,7 +31,7 @@ // We tend to generate digests for source codes in a lot of different places. // This represents the type for those digests to prevent us hard coding details // of hashing function at every place that needs to store this information. -using FileDigest = decltype(llvm::SHA1::hash({})); +using FileDigest = std::array; FileDigest digest(StringRef Content); Optional digestFile(const SourceManager &SM, FileID FID); Index: clang-tools-extra/trunk/clangd/SourceCode.cpp =================================================================== --- clang-tools-extra/trunk/clangd/SourceCode.cpp +++ clang-tools-extra/trunk/clangd/SourceCode.cpp @@ -25,6 +25,7 @@ #include "llvm/Support/Error.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Path.h" +#include "llvm/Support/xxhash.h" #include namespace clang { @@ -376,7 +377,13 @@ } FileDigest digest(llvm::StringRef Content) { - return llvm::SHA1::hash({(const uint8_t *)Content.data(), Content.size()}); + uint64_t Hash{llvm::xxHash64(Content)}; + FileDigest Result; + for (unsigned I = 0; I < Result.size(); ++I) { + Result[I] = uint8_t(Hash); + Hash >>= 8; + } + return Result; } llvm::Optional digestFile(const SourceManager &SM, FileID FID) { Index: clang-tools-extra/trunk/clangd/index/Background.h =================================================================== --- clang-tools-extra/trunk/clangd/index/Background.h +++ clang-tools-extra/trunk/clangd/index/Background.h @@ -19,7 +19,6 @@ #include "index/Serialization.h" #include "clang/Tooling/CompilationDatabase.h" #include "llvm/ADT/StringMap.h" -#include "llvm/Support/SHA1.h" #include "llvm/Support/Threading.h" #include #include Index: clang-tools-extra/trunk/clangd/index/Background.cpp =================================================================== --- clang-tools-extra/trunk/clangd/index/Background.cpp +++ clang-tools-extra/trunk/clangd/index/Background.cpp @@ -32,7 +32,6 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/Error.h" -#include "llvm/Support/SHA1.h" #include "llvm/Support/Threading.h" #include Index: clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp =================================================================== --- clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp +++ clang-tools-extra/trunk/clangd/index/BackgroundIndexStorage.cpp @@ -13,18 +13,11 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" -#include "llvm/Support/SHA1.h" namespace clang { namespace clangd { namespace { -using FileDigest = decltype(llvm::SHA1::hash({})); - -static FileDigest digest(StringRef Content) { - return llvm::SHA1::hash({(const uint8_t *)Content.data(), Content.size()}); -} - std::string getShardPathFromFilePath(llvm::StringRef ShardRoot, llvm::StringRef FilePath) { llvm::SmallString<128> ShardRootSS(ShardRoot); Index: clang-tools-extra/trunk/clangd/index/Serialization.cpp =================================================================== --- clang-tools-extra/trunk/clangd/index/Serialization.cpp +++ clang-tools-extra/trunk/clangd/index/Serialization.cpp @@ -444,7 +444,7 @@ // The current versioning scheme is simple - non-current versions are rejected. // If you make a breaking change, bump this version number to invalidate stored // data. Later we may want to support some backward compatibility. -constexpr static uint32_t Version = 11; +constexpr static uint32_t Version = 12; llvm::Expected readRIFF(llvm::StringRef Data) { auto RIFF = riff::readFile(Data); Index: clang-tools-extra/trunk/clangd/unittests/SerializationTests.cpp =================================================================== --- clang-tools-extra/trunk/clangd/unittests/SerializationTests.cpp +++ clang-tools-extra/trunk/clangd/unittests/SerializationTests.cpp @@ -10,7 +10,6 @@ #include "index/Index.h" #include "index/Serialization.h" #include "clang/Tooling/CompilationDatabase.h" -#include "llvm/Support/SHA1.h" #include "llvm/Support/ScopedPrinter.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -208,9 +207,7 @@ std::string TestContent("TestContent"); IncludeGraphNode IGN; - IGN.Digest = - llvm::SHA1::hash({reinterpret_cast(TestContent.data()), - TestContent.size()}); + IGN.Digest = digest(TestContent); IGN.DirectIncludes = {"inc1", "inc2"}; IGN.URI = "URI"; IGN.Flags |= IncludeGraphNode::SourceFlag::IsTU;