mirror of
https://github.com/MaskRay/ccls.git
synced 2024-11-21 23:25:07 +00:00
Adapt llvmorg-12-init-11522-g4c55c3b66de: change ComputePreambleBounds
This commit is contained in:
parent
68d6e4122d
commit
feb153a843
@ -350,7 +350,11 @@ void buildPreamble(Session &session, CompilerInvocation &ci,
|
||||
std::string content = session.wfiles->getContent(task.path);
|
||||
std::unique_ptr<llvm::MemoryBuffer> buf =
|
||||
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);
|
||||
#endif
|
||||
if (!task.from_diag && oldP &&
|
||||
oldP->preamble.CanReuse(ci, buf.get(), bounds, fs.get()))
|
||||
return;
|
||||
@ -472,8 +476,13 @@ void *completionMain(void *manager_) {
|
||||
DiagnosticConsumer dc;
|
||||
std::string content = manager->wfiles->getContent(task->path);
|
||||
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 =
|
||||
ComputePreambleBounds(*ci->getLangOpts(), buf.get(), 0);
|
||||
#endif
|
||||
bool in_preamble =
|
||||
getOffsetForPosition({task->position.line, task->position.character},
|
||||
content) < (int)bounds.Size;
|
||||
|
Loading…
Reference in New Issue
Block a user