Merge pull request #5837 from bnbarham/temp-lsp-fix

bnbarham · web-flow · commit d400e33043af · 2022-12-19T16:24:14.000-08:00
[clangd] Wait for stdlib indexing to finish before destroying the index
diff --git a/clang-tools-extra/clangd/ClangdServer.cpp b/clang-tools-extra/clangd/ClangdServer.cpp
@@ -233,6 +233,9 @@ ClangdServer::ClangdServer(const GlobalCompilationDatabase &CDB,
 }
 
 ClangdServer::~ClangdServer() {
+  // Wait for stdlib indexing to finish.
+  if (IndexTasks)
+    IndexTasks->wait();
   // Destroying TUScheduler first shuts down request threads that might
   // otherwise access members concurrently.
   // (Nobody can be using TUScheduler because we're on the main thread).

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,9 @@ ClangdServer::ClangdServer(const GlobalCompilationDatabase &CDB,`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`ClangdServer::~ClangdServer() {`
	`236`	`+ // Wait for stdlib indexing to finish.`
	`237`	`+ if (IndexTasks)`
	`238`	`+ IndexTasks->wait();`
`236`	`239`	`// Destroying TUScheduler first shuts down request threads that might`
`237`	`240`	`// otherwise access members concurrently.`
`238`	`241`	`// (Nobody can be using TUScheduler because we're on the main thread).`