Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 17:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt llvmorg-12-init-11522-g4c55c3b66de: change ComputePreambleBounds

Browse Source
This commit is contained in:
Fangrui Song 2020-11-18 22:33:04 -08:00
parent 68d6e4122d
commit feb153a843
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sema_manager.cc
View File

@ -350,7 +350,11 @@ void buildPreamble(Session &session, CompilerInvocation &ci,
std::string content = session.wfiles->getContent(task.path); std::string content = session.wfiles->getContent(task.path);
std::unique_ptr<llvm::MemoryBuffer> buf = std::unique_ptr<llvm::MemoryBuffer> buf =
llvm::MemoryBuffer::getMemBuffer(content); llvm::MemoryBuffer::getMemBuffer(content);
#if LLVM_VERSION_MAJOR >= 12 // llvmorg-12-init-11522-g4c55c3b66de
auto bounds = ComputePreambleBounds(*ci.getLangOpts(), *buf, 0);
#else
auto bounds = ComputePreambleBounds(*ci.getLangOpts(), buf.get(), 0); auto bounds = ComputePreambleBounds(*ci.getLangOpts(), buf.get(), 0);
#endif
if (!task.from_diag && oldP && if (!task.from_diag && oldP &&
oldP->preamble.CanReuse(ci, buf.get(), bounds, fs.get())) oldP->preamble.CanReuse(ci, buf.get(), bounds, fs.get()))
return; return;
@ -472,8 +476,13 @@ void *completionMain(void *manager_) {
DiagnosticConsumer dc; DiagnosticConsumer dc;
std::string content = manager->wfiles->getContent(task->path); std::string content = manager->wfiles->getContent(task->path);
auto buf = llvm::MemoryBuffer::getMemBuffer(content); auto buf = llvm::MemoryBuffer::getMemBuffer(content);
#if LLVM_VERSION_MAJOR >= 12 // llvmorg-12-init-11522-g4c55c3b66de
PreambleBounds bounds =
ComputePreambleBounds(*ci->getLangOpts(), *buf, 0);
#else
PreambleBounds bounds = PreambleBounds bounds =
ComputePreambleBounds(*ci->getLangOpts(), buf.get(), 0); ComputePreambleBounds(*ci->getLangOpts(), buf.get(), 0);
#endif
bool in_preamble = bool in_preamble =
getOffsetForPosition({task->position.line, task->position.character}, getOffsetForPosition({task->position.line, task->position.character},
content) < (int)bounds.Size; content) < (int)bounds.Size;