From 4503cf5f231368d6e11af724b78f1371463d86a6 Mon Sep 17 00:00:00 2001 From: Kadir Cetinkaya Date: Fri, 17 Apr 2020 13:19:52 +0200 Subject: [PATCH] [clangd] Drop dangling relations while sharding Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D78359 --- clang-tools-extra/clangd/index/FileIndex.cpp | 6 +++--- clang-tools-extra/clangd/unittests/FileIndexTests.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp index 91914be00148..590bf46ec01c 100644 --- a/clang-tools-extra/clangd/index/FileIndex.cpp +++ b/clang-tools-extra/clangd/index/FileIndex.cpp @@ -174,9 +174,9 @@ FileShardedIndex::FileShardedIndex(IndexFileIn Input, PathRef HintPath) // not have been indexed, see SymbolCollector::processRelations for details. if (Index.Relations) { for (const auto &R : *Index.Relations) { - auto *File = SymbolIDToFile.lookup(R.Subject); - assert(File && "unknown subject in relation"); - File->Relations.insert(&R); + // FIXME: RelationSlab shouldn't contain dangling relations. + if (auto *File = SymbolIDToFile.lookup(R.Subject)) + File->Relations.insert(&R); } } // Store only the direct includes of a file in a shard. diff --git a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp index dc39ad2acf25..328892f750de 100644 --- a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp +++ b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp @@ -540,6 +540,8 @@ TEST(FileShardedIndexTest, Sharding) { B.insert(Relation{Sym1.ID, RelationKind::BaseOf, Sym2.ID}); // Should be stored in b.h B.insert(Relation{Sym2.ID, RelationKind::BaseOf, Sym1.ID}); + // Dangling relation should be dropped. + B.insert(Relation{symbol("3").ID, RelationKind::BaseOf, Sym1.ID}); IF.Relations = std::move(B).build(); }