Skip to content

Commit

Permalink
Adapt llvmorg-15-init-7692-gd79ad2f1dbc2: PPCallbacks::InclusionDirec…
Browse files Browse the repository at this point in the history
…tive parameter
MaskRay committed Apr 17, 2022
1 parent 790daca commit 7445891
Showing 2 changed files with 18 additions and 2 deletions.
10 changes: 9 additions & 1 deletion src/indexer.cc
Original file line number Diff line number Diff line change
@@ -1096,10 +1096,18 @@ class IndexPPCallbacks : public PPCallbacks {
}
void InclusionDirective(SourceLocation hashLoc, const Token &tok,
StringRef included, bool isAngled,
CharSourceRange filenameRange, const FileEntry *file,
CharSourceRange filenameRange,
#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
llvm::Optional<FileEntryRef> fileRef,
#else
const FileEntry *file,
#endif
StringRef searchPath, StringRef relativePath,
const Module *imported,
SrcMgr::CharacteristicKind fileType) override {
#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
const FileEntry *file = fileRef ? &fileRef->getFileEntry() : nullptr;
#endif
if (!file)
return;
auto spell = fromCharSourceRange(sm, param.ctx->getLangOpts(),
10 changes: 9 additions & 1 deletion src/sema_manager.cc
Original file line number Diff line number Diff line change
@@ -178,11 +178,19 @@ class StoreInclude : public PPCallbacks {
: sm(sm), out(out) {}
void InclusionDirective(SourceLocation hashLoc, const Token &includeTok,
StringRef fileName, bool isAngled,
CharSourceRange filenameRange, const FileEntry *file,
CharSourceRange filenameRange,
#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
llvm::Optional<FileEntryRef> fileRef,
#else
const FileEntry *file,
#endif
StringRef searchPath, StringRef relativePath,
const clang::Module *imported,
SrcMgr::CharacteristicKind fileKind) override {
(void)sm;
#if LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
const FileEntry *file = fileRef ? &fileRef->getFileEntry() : nullptr;
#endif
if (file && seen.insert(file).second)
out.emplace_back(pathFromFileEntry(*file), file->getModificationTime());
}

0 comments on commit 7445891

Please sign in to comment.