diff options
| author | Erik Verbruggen <erikjv@me.com> | 2016-10-27 14:17:10 +0000 |
|---|---|---|
| committer | Erik Verbruggen <erikjv@me.com> | 2016-10-27 14:17:10 +0000 |
| commit | ca12756c3c4698a21b8a8ed681682da7dba09b1b (patch) | |
| tree | 1213de866ff672c394cddedd9f9812eec93f36bc /lib/Lex/PPMacroExpansion.cpp | |
| parent | 32adf66f72945d7155cbffebde4f06a2d7911782 (diff) | |
Do not print include_next/pragma once warnings when input is a header.
r276653 suppressed the pragma once warning when generating a PCH file.
This patch extends that to any main file for which clang is told (with
the -x option) that it's a header file. It will also suppress the
warning "#include_next in primary source file".
Differential Revision: http://reviews.llvm.org/D25989
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@285295 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPMacroExpansion.cpp')
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index fde053b7c7..a9e7dcbe54 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -1421,7 +1421,11 @@ static bool EvaluateHasIncludeNext(Token &Tok, // Preprocessor::HandleIncludeNextDirective. const DirectoryLookup *Lookup = PP.GetCurDirLookup(); const FileEntry *LookupFromFile = nullptr; - if (PP.isInPrimaryFile()) { + if (PP.isInPrimaryFile() && PP.getLangOpts().IsHeaderFile) { + // If the main file is a header, then it's either for PCH/AST generation, + // or libclang opened it. Either way, handle it as a normal include below + // and do not complain about __has_include_next. + } else if (PP.isInPrimaryFile()) { Lookup = nullptr; PP.Diag(Tok, diag::pp_include_next_in_primary); } else if (PP.getCurrentSubmodule()) { |