[clangd] Fix an assertion failure in background index.
Summary:
When indexing a file which contains an uncompilable error, we will
trigger an assertion failure -- the IndexFileIn data is not set, but we
access them in the backgound index.
Reviewers: kadircet
Subscribers: ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, cfe-commits
Differential Revision: https://reviews.llvm.org/D55650
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@349144 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/index/Background.cpp b/clangd/index/Background.cpp
index 6c104cb..897c513 100644
--- a/clangd/index/Background.cpp
+++ b/clangd/index/Background.cpp
@@ -382,6 +382,14 @@
if (!Action->Execute())
return createStringError(inconvertibleErrorCode(), "Execute() failed");
Action->EndSourceFile();
+ if (Clang->hasDiagnostics() &&
+ Clang->getDiagnostics().hasUncompilableErrorOccurred()) {
+ return createStringError(inconvertibleErrorCode(),
+ "IndexingAction failed: has uncompilable errors");
+ }
+
+ assert(Index.Symbols && Index.Refs && Index.Sources
+ && "Symbols, Refs and Sources must be set.");
log("Indexed {0} ({1} symbols, {2} refs, {3} files)",
Inputs.CompileCommand.Filename, Index.Symbols->size(),
diff --git a/unittests/clangd/BackgroundIndexTests.cpp b/unittests/clangd/BackgroundIndexTests.cpp
index 1ce63f7..438a954 100644
--- a/unittests/clangd/BackgroundIndexTests.cpp
+++ b/unittests/clangd/BackgroundIndexTests.cpp
@@ -66,6 +66,25 @@
BackgroundIndexTest() { preventThreadStarvationInTests(); }
};
+TEST_F(BackgroundIndexTest, NoCrashOnErrorFile) {
+ MockFSProvider FS;
+ FS.Files[testPath("root/A.cc")] = "error file";
+ llvm::StringMap<std::string> Storage;
+ size_t CacheHits = 0;
+ MemoryShardStorage MSS(Storage, CacheHits);
+ OverlayCDB CDB(/*Base=*/nullptr);
+ BackgroundIndex Idx(Context::empty(), "", FS, CDB,
+ [&](llvm::StringRef) { return &MSS; });
+
+ tooling::CompileCommand Cmd;
+ Cmd.Filename = testPath("root/A.cc");
+ Cmd.Directory = testPath("root");
+ Cmd.CommandLine = {"clang++", "-DA=1", testPath("root/A.cc")};
+ CDB.setCompileCommand(testPath("root/A.cc"), Cmd);
+
+ ASSERT_TRUE(Idx.blockUntilIdleForTest());
+}
+
TEST_F(BackgroundIndexTest, IndexTwoFiles) {
MockFSProvider FS;
// a.h yields different symbols when included by A.cc vs B.cc.
