diff options
| -rw-r--r-- | clang-tools-extra/clangd/index/FileIndex.cpp | 4 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/index/Serialization.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp index 22c6e860fb8..49746ae926b 100644 --- a/clang-tools-extra/clangd/index/FileIndex.cpp +++ b/clang-tools-extra/clangd/index/FileIndex.cpp @@ -138,7 +138,9 @@ FileSymbols::buildIndex(IndexType Type, DuplicateHandling DuplicateHandle) { for (const RefSlab *Refs : MainFileRefs) for (const auto &Sym : *Refs) { auto It = Merged.find(Sym.first); - assert(It != Merged.end() && "Reference to unknown symbol"); + // This might happen while background-index is still running. + if (It == Merged.end()) + continue; It->getSecond().References += Sym.second.size(); } SymsStorage.reserve(Merged.size()); diff --git a/clang-tools-extra/clangd/index/Serialization.cpp b/clang-tools-extra/clangd/index/Serialization.cpp index 62eb3fcdf37..12993eb631c 100644 --- a/clang-tools-extra/clangd/index/Serialization.cpp +++ b/clang-tools-extra/clangd/index/Serialization.cpp @@ -370,7 +370,7 @@ readRefs(Reader &Data, llvm::ArrayRef<llvm::StringRef> Strings) { // 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 = 9; +constexpr static uint32_t Version = 10; llvm::Expected<IndexFileIn> readRIFF(llvm::StringRef Data) { auto RIFF = riff::readFile(Data); |
