Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-04 16:02:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SEMA_MANAGER] fix missing PrecompiledPreamble::Build parameter

Browse Source 
since llvm commit cc929590ad305f0d068709c7c7999f5fc6118dc9 (CommitDate: Tue Mar 7 08:25:38 2023 -0500)
PrecompiledPreamble::Build() has an additional parameter for the default
temporary path.

This introduced change breaks the ccls Build. This commit fixes it by
checking the CINDEX_VERSION_MAJOR and CINDEX_VERSION_MINOR, and if the
version is above 0.63 adds this path to nothing, which bahaves as the
previous version according to the code commets.

This is kind of ugly but I don't know a cleaner solution.

Signed-off-by: Wadim Mueller <wadim.mueller@continental-corporation.com>
This commit is contained in:
Wadim Mueller 2023-06-28 13:47:01 +02:00
parent 8bc3959537
commit a5a4313aa0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sema_manager.cc
View File

@ -17,6 +17,7 @@
#include <llvm/Config/llvm-config.h> #include <llvm/Config/llvm-config.h>
#include <llvm/Support/CrashRecoveryContext.h> #include <llvm/Support/CrashRecoveryContext.h>
#include <llvm/Support/Threading.h> #include <llvm/Support/Threading.h>
#include <clang-c/Index.h>
using namespace clang; using namespace clang;
using namespace llvm; using namespace llvm;
@ -403,8 +404,11 @@ void buildPreamble(Session &session, CompilerInvocation &ci,
} }
CclsPreambleCallbacks pc; CclsPreambleCallbacks pc;
if (auto newPreamble = PrecompiledPreamble::Build( if (auto newPreamble = PrecompiledPreamble::Build(ci, buf.get(), bounds, *de, fs, session.pch, true,
ci, buf.get(), bounds, *de, fs, session.pch, true, pc)) { #if CINDEX_VERSION_MAJOR >= 0 && CINDEX_VERSION_MINOR > 63
"",
#endif
pc)) {
assert(!ci.getPreprocessorOpts().RetainRemappedFileBuffers); assert(!ci.getPreprocessorOpts().RetainRemappedFileBuffers);
if (oldP) { if (oldP) {
auto &old_includes = oldP->includes; auto &old_includes = oldP->includes;