From 74b3acefc7b6355e89bb9b09dc88a5948f65c342 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Wed, 23 Dec 2020 22:41:46 +0100 Subject: [PATCH] [clangd] Fix case mismatch crash on in CDB on windows after 92dd077af1ff8 See https://github.com/clangd/clangd/issues/631 --- clang-tools-extra/clangd/GlobalCompilationDatabase.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp b/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp index 41b549c..86375fa 100644 --- a/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp +++ b/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp @@ -511,11 +511,14 @@ void DirectoryBasedGlobalCompilationDatabase::broadcastCDB( // Given that we know that CDBs have been moved/generated, don't trust caches. // (This should be rare, so it's OK to add a little latency). constexpr auto IgnoreCache = std::chrono::steady_clock::time_point::max(); - for (DirectoryCache *Dir : getDirectoryCaches(FileAncestors)) { + auto DirectoryCaches = getDirectoryCaches(FileAncestors); + assert(DirectoryCaches.size() == FileAncestors.size()); + for (unsigned I = 0; I < DirectoryCaches.size(); ++I) { bool ShouldBroadcast = false; - if (Dir->get(Opts.TFS, ShouldBroadcast, /*FreshTime=*/IgnoreCache, - /*FreshTimeMissing=*/IgnoreCache)) - DirectoryHasCDB.find(Dir->Path)->setValue(true); + if (DirectoryCaches[I]->get(Opts.TFS, ShouldBroadcast, + /*FreshTime=*/IgnoreCache, + /*FreshTimeMissing=*/IgnoreCache)) + DirectoryHasCDB.find(FileAncestors[I])->setValue(true); } std::vector GovernedFiles; -- 2.7.4