From a9bf32763d3929672fe243f84e6a103c91260ef0 Mon Sep 17 00:00:00 2001 From: Kirill Bobyrev Date: Thu, 13 Jan 2022 13:42:01 +0100 Subject: [PATCH] [clangd] Fix build after D115243 The api for loadIndex changed but was not updated everywhere due to differences in the build configuration. --- clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp | 6 ++++-- clang-tools-extra/clangd/index/remote/server/Server.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp b/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp index 68bd8d0..77fca2a 100644 --- a/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp +++ b/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp @@ -23,11 +23,13 @@ namespace clangd { namespace { std::unique_ptr buildMem() { - return loadIndex(IndexFilename, /*UseDex=*/false); + return loadIndex(IndexFilename, clang::clangd::SymbolOrigin::Static, + /*UseDex=*/false); } std::unique_ptr buildDex() { - return loadIndex(IndexFilename, /*UseDex=*/true); + return loadIndex(IndexFilename, clang::clangd::SymbolOrigin::Static, + /*UseDex=*/true); } // Reads JSON array of serialized FuzzyFindRequest's from user-provided file. diff --git a/clang-tools-extra/clangd/index/remote/server/Server.cpp b/clang-tools-extra/clangd/index/remote/server/Server.cpp index b5acb5d..ee1d74f 100644 --- a/clang-tools-extra/clangd/index/remote/server/Server.cpp +++ b/clang-tools-extra/clangd/index/remote/server/Server.cpp @@ -534,7 +534,8 @@ int main(int argc, char *argv[]) { return Status.getError().value(); } - auto SymIndex = clang::clangd::loadIndex(IndexPath); + auto SymIndex = + clang::clangd::loadIndex(IndexPath, clang::clangd::SymbolOrigin::Static); if (!SymIndex) { llvm::errs() << "Failed to open the index.\n"; return -1; -- 2.7.4