Author: Kadir Cetinkaya Date: 2021-10-20T16:32:32+02:00 New Revision: c959da9ef344a22e3753e2e62af46a63a33cd80f
URL: https://github.com/llvm/llvm-project/commit/c959da9ef344a22e3753e2e62af46a63a33cd80f DIFF: https://github.com/llvm/llvm-project/commit/c959da9ef344a22e3753e2e62af46a63a33cd80f.diff LOG: [clangd] Only publish preamble after rebuilds Don't invoke parsing callback for preamble if clangd is using a previously built one. Differential Revision: https://reviews.llvm.org/D112137 Added: Modified: clang-tools-extra/clangd/TUScheduler.cpp clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/TUScheduler.cpp b/clang-tools-extra/clangd/TUScheduler.cpp index 700d8264555f..4dd7a06b8bce 100644 --- a/clang-tools-extra/clangd/TUScheduler.cpp +++ b/clang-tools-extra/clangd/TUScheduler.cpp @@ -901,15 +901,17 @@ void ASTWorker::runWithAST( void PreambleThread::build(Request Req) { assert(Req.CI && "Got preamble request with null compiler invocation"); const ParseInputs &Inputs = Req.Inputs; + bool ReusedPreamble = false; Status.update([&](TUStatus &Status) { Status.PreambleActivity = PreambleAction::Building; }); - auto _ = llvm::make_scope_exit([this, &Req] { + auto _ = llvm::make_scope_exit([this, &Req, &ReusedPreamble] { ASTPeer.updatePreamble(std::move(Req.CI), std::move(Req.Inputs), LatestBuild, std::move(Req.CIDiags), std::move(Req.WantDiags)); - Callbacks.onPreamblePublished(FileName); + if (!ReusedPreamble) + Callbacks.onPreamblePublished(FileName); }); if (!LatestBuild || Inputs.ForceRebuild) { @@ -918,6 +920,7 @@ void PreambleThread::build(Request Req) { } else if (isPreambleCompatible(*LatestBuild, Inputs, FileName, *Req.CI)) { vlog("Reusing preamble version {0} for version {1} of {2}", LatestBuild->Version, Inputs.Version, FileName); + ReusedPreamble = true; return; } else { vlog("Rebuilding invalidated preamble for {0} version {1} (previous was " diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp index e15725d5120b..306392fb2731 100644 --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -1165,6 +1165,32 @@ TEST_F(TUSchedulerTests, AsyncPreambleThread) { Ready.notify(); } +TEST_F(TUSchedulerTests, OnlyPublishWhenPreambleIsBuilt) { + struct PreamblePublishCounter : public ParsingCallbacks { + PreamblePublishCounter(int &PreamblePublishCount) + : PreamblePublishCount(PreamblePublishCount) {} + void onPreamblePublished(PathRef File) override { ++PreamblePublishCount; } + int &PreamblePublishCount; + }; + + int PreamblePublishCount = 0; + TUScheduler S(CDB, optsForTest(), + std::make_unique<PreamblePublishCounter>(PreamblePublishCount)); + + Path File = testPath("foo.cpp"); + S.update(File, getInputs(File, ""), WantDiagnostics::Auto); + S.blockUntilIdle(timeoutSeconds(10)); + EXPECT_EQ(PreamblePublishCount, 1); + // Same contents, no publish. + S.update(File, getInputs(File, ""), WantDiagnostics::Auto); + S.blockUntilIdle(timeoutSeconds(10)); + EXPECT_EQ(PreamblePublishCount, 1); + // New contents, should publish. + S.update(File, getInputs(File, "#define FOO"), WantDiagnostics::Auto); + S.blockUntilIdle(timeoutSeconds(10)); + EXPECT_EQ(PreamblePublishCount, 2); +} + // If a header file is missing from the CDB (or inferred using heuristics), and // it's included by another open file, then we parse it using that files flags. TEST_F(TUSchedulerTests, IncluderCache) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits