diff options
author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-09-18 23:27:02 +0000 |
---|---|---|
committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-09-18 23:27:02 +0000 |
commit | 30d3f201efd974e92af39ab7522ca30ddb2a379a (patch) | |
tree | 8de8a5966bdfce89dff257c1ff211ace4fef2086 /lib | |
parent | c8df8c22bd6f649763c20fb4b8a944309008da6a (diff) |
Add a callback for `__has_include` and use it for dependency scanning.
This adds a preprocessor callback for the `__has_include` and
`__has_include_next` directives.
Successful checking for the presence of a header should add it to the list of
header dependencies so this overrides the callback in the dependency scanner.
Patch by Pete Cooper with some additions by me.
rdar://problem/39545636
Differential Revision: https://reviews.llvm.org/D30882
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@342517 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Frontend/DependencyFile.cpp | 15 | ||||
-rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/lib/Frontend/DependencyFile.cpp b/lib/Frontend/DependencyFile.cpp index a3f3479209..fdccd9134e 100644 --- a/lib/Frontend/DependencyFile.cpp +++ b/lib/Frontend/DependencyFile.cpp @@ -200,6 +200,10 @@ public: const Module *Imported, SrcMgr::CharacteristicKind FileType) override; + void HasInclude(SourceLocation Loc, StringRef SpelledFilename, bool IsAngled, + const FileEntry *File, + SrcMgr::CharacteristicKind FileType) override; + void EndOfMainFile() override { OutputDependencyFile(); } @@ -328,6 +332,17 @@ void DFGImpl::InclusionDirective(SourceLocation HashLoc, } } +void DFGImpl::HasInclude(SourceLocation Loc, StringRef SpelledFilename, + bool IsAngled, const FileEntry *File, + SrcMgr::CharacteristicKind FileType) { + if (!File) + return; + StringRef Filename = File->getName(); + if (!FileMatchesDepCriteria(Filename.data(), FileType)) + return; + AddFilename(llvm::sys::path::remove_leading_dotslash(Filename)); +} + bool DFGImpl::AddFilename(StringRef Filename) { if (FilesSet.insert(Filename).second) { Files.push_back(Filename); diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 346dd947c0..ffc2ed8c93 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -23,6 +23,7 @@ #include "clang/Lex/CodeCompletionHandler.h" #include "clang/Lex/DirectoryLookup.h" #include "clang/Lex/ExternalPreprocessorSource.h" +#include "clang/Lex/HeaderSearch.h" #include "clang/Lex/LexDiagnostic.h" #include "clang/Lex/MacroArgs.h" #include "clang/Lex/MacroInfo.h" @@ -1242,6 +1243,13 @@ static bool EvaluateHasIncludeCommon(Token &Tok, PP.LookupFile(FilenameLoc, Filename, isAngled, LookupFrom, LookupFromFile, CurDir, nullptr, nullptr, nullptr, nullptr); + if (PPCallbacks *Callbacks = PP.getPPCallbacks()) { + SrcMgr::CharacteristicKind FileType = SrcMgr::C_User; + if (File) + FileType = PP.getHeaderSearchInfo().getFileDirFlavor(File); + Callbacks->HasInclude(FilenameLoc, Filename, isAngled, File, FileType); + } + // Get the result value. A result of true means the file exists. return File != nullptr; } |