Merge pull request #9140 from bnbarham/index-rehash

[Index] Convert to hashing to `HashBuilder` with BLAKE3

Author: bnbarham

clang/include/clang/Index/IndexRecordWriter.h

@@ -75,7 +75,7 @@ class IndexRecordWriter {
   /// \returns Success if we should continue writing this record, AlreadyExists
   /// if the record file has already been written, or Failure if there was an
   /// error, in which case \p Error will be set.
-  Result beginRecord(StringRef Filename, llvm::hash_code RecordHash,
+  Result beginRecord(StringRef Filename, uint64_t RecordHash,
                      std::string &Error, std::string *RecordFile = nullptr);
 
   /// Finish writing the record file.

clang/lib/Index/ClangIndexRecordWriter.cpp

@@ -63,8 +63,7 @@ StringRef ClangIndexRecordWriter::getUSRNonCached(const IdentifierInfo *Name,
 
 ClangIndexRecordWriter::ClangIndexRecordWriter(ASTContext &Ctx,
                                                RecordingOptions Opts)
-    : Impl(Opts.DataDirPath), Ctx(Ctx), RecordOpts(std::move(Opts)),
-      Hasher(Ctx) {
+    : Impl(Opts.DataDirPath), Ctx(Ctx), RecordOpts(std::move(Opts)) {
   if (Opts.RecordSymbolCodeGenName)
     ASTNameGen.reset(new ASTNameGenerator(Ctx));
 }
@@ -76,7 +75,9 @@ bool ClangIndexRecordWriter::writeRecord(StringRef Filename,
                                          std::string &Error,
                                          std::string *OutRecordFile) {
 
-  auto RecordHash = Hasher.hashRecord(IdxRecord);
+  std::array<uint8_t, 8> RecordHashArr = index::hashRecord(IdxRecord, Ctx);
+  uint64_t RecordHash = 0;
+  std::memcpy(&RecordHash, RecordHashArr.data(), RecordHashArr.size());
 
   switch (Impl.beginRecord(Filename, RecordHash, Error, OutRecordFile)) {
   case IndexRecordWriter::Result::Success:

clang/lib/Index/ClangIndexRecordWriter.h

@@ -33,7 +33,6 @@ class ClangIndexRecordWriter {
   std::unique_ptr<ASTNameGenerator> ASTNameGen;
   llvm::BumpPtrAllocator Allocator;
   llvm::DenseMap<const void *, StringRef> USRByDecl;
-  IndexRecordHasher Hasher;
 
 public:
   ClangIndexRecordWriter(ASTContext &Ctx, RecordingOptions Opts);