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

Adapt llvm 22 changes

Browse Source 
Type::Elaborated is removed by llvmorg-22-init-3166-g91cdd35008e9

llvm::sys::fs and clang functions are changed due to
https://discourse.llvm.org/t/rfc-file-system-sandboxing-in-clang-llvm/88791
This commit is contained in:
Fangrui Song 2025-11-15 13:37:03 -08:00
parent a7068f13ec
commit d31cc9f076
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/indexer.cc
View File

@ -364,9 +364,11 @@ try_again:
// FIXME: Template type parameters! // FIXME: Template type parameters!
#if LLVM_VERSION_MAJOR < 22 // llvmorg-22-init-3166-g91cdd35008e9
case Type::Elaborated: case Type::Elaborated:
tp = cast<ElaboratedType>(tp)->getNamedType().getTypePtrOrNull(); tp = cast<ElaboratedType>(tp)->getNamedType().getTypePtrOrNull();
goto try_again; goto try_again;
#endif
default: default:
break; break;
@ -1266,7 +1268,7 @@ IndexResult index(WorkingFiles *wfiles, VFS *vfs, const std::string &opt_wdir, c
clang->setInvocation(std::move(ci)); clang->setInvocation(std::move(ci));
#endif #endif
clang->createDiagnostics( clang->createDiagnostics(
#if LLVM_VERSION_MAJOR >= 20 #if LLVM_VERSION_MAJOR >= 20 && LLVM_VERSION_MAJOR < 22
*fs, *fs,
#endif #endif
&dc, false); &dc, false);
@ -1279,7 +1281,12 @@ IndexResult index(WorkingFiles *wfiles, VFS *vfs, const std::string &opt_wdir, c
if (!clang->hasTarget()) if (!clang->hasTarget())
return {}; return {};
clang->getPreprocessorOpts().RetainRemappedFileBuffers = true; clang->getPreprocessorOpts().RetainRemappedFileBuffers = true;
#if LLVM_VERSION_MAJOR >= 22
clang->setVirtualFileSystem(fs);
clang->createFileManager();
#else
clang->createFileManager(fs); clang->createFileManager(fs);
#endif
clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true)); clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true));
IndexParam param(*vfs, no_linkage); IndexParam param(*vfs, no_linkage);

4
src/messages/initialize.cc
View File

@ -345,7 +345,11 @@ void do_initialize(MessageHandler *m, InitializeParam &param, ReplyOnce &reply)
if (g_config->cache.directory.size()) { if (g_config->cache.directory.size()) {
SmallString<256> path(g_config->cache.directory); SmallString<256> path(g_config->cache.directory);
#if LLVM_VERSION_MAJOR >= 22
sys::path::make_absolute(project_path, path);
#else
sys::fs::make_absolute(project_path, path); sys::fs::make_absolute(project_path, path);
#endif
// Use upper case for the Driver letter on Windows. // Use upper case for the Driver letter on Windows.
g_config->cache.directory = normalizePath(path.str()); g_config->cache.directory = normalizePath(path.str());
ensureEndsInSlash(g_config->cache.directory); ensureEndsInSlash(g_config->cache.directory);

7
src/sema_manager.cc
View File

@ -268,7 +268,7 @@ std::unique_ptr<CompilerInstance> buildCompilerInstance(Session &session, std::u
clang->setInvocation(std::move(ci)); clang->setInvocation(std::move(ci));
#endif #endif
clang->createDiagnostics( clang->createDiagnostics(
#if LLVM_VERSION_MAJOR >= 20 #if LLVM_VERSION_MAJOR >= 20 && LLVM_VERSION_MAJOR < 22
*fs, *fs,
#endif #endif
&dc, false); &dc, false);
@ -283,7 +283,12 @@ std::unique_ptr<CompilerInstance> buildCompilerInstance(Session &session, std::u
// Construct SourceManager with UserFilesAreVolatile: true because otherwise // Construct SourceManager with UserFilesAreVolatile: true because otherwise
// RequiresNullTerminator: true may cause out-of-bounds read when a file is // RequiresNullTerminator: true may cause out-of-bounds read when a file is
// mmap'ed but is saved concurrently. // mmap'ed but is saved concurrently.
#if LLVM_VERSION_MAJOR >= 22
clang->setVirtualFileSystem(fs);
clang->createFileManager();
#else
clang->createFileManager(fs); clang->createFileManager(fs);
#endif
clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true)); clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true));
auto &isec = clang->getFrontendOpts().Inputs; auto &isec = clang->getFrontendOpts().Inputs;
if (isec.size()) { if (isec.size()) {