diff --git a/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp b/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp index d830190bfdfdb7..73f19abaeb9db8 100644 --- a/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp +++ b/clang-tools-extra/clangd/GlobalCompilationDatabase.cpp @@ -276,7 +276,7 @@ bool DirectoryBasedGlobalCompilationDatabase::DirectoryCache::load( // For these, we know the files they read and cache their metadata so we can // cheaply validate whether they've changed, and hot-reload if they have. // (As a bonus, these are also VFS-clean)! - struct CDBFile { + struct { CachedFile *File; // Wrapper for {Fixed,JSON}CompilationDatabase::loadFromBuffer. llvm::function_ref( @@ -284,10 +284,12 @@ bool DirectoryBasedGlobalCompilationDatabase::DirectoryCache::load( /*Data*/ llvm::StringRef, /*ErrorMsg*/ std::string &)> Parser; + } Files[] = { + {&CompileCommandsJson, parseJSON}, + {&BuildCompileCommandsJson, parseJSON}, + {&CompileFlagsTxt, parseFixed}, }; - for (const auto &Entry : {CDBFile{&CompileCommandsJson, parseJSON}, - CDBFile{&BuildCompileCommandsJson, parseJSON}, - CDBFile{&CompileFlagsTxt, parseFixed}}) { + for (const auto &Entry : Files) { bool Active = ActiveCachedFile == Entry.File; auto Loaded = Entry.File->load(FS, Active); switch (Loaded.Result) {