diff options
Diffstat (limited to 'clang/lib/Lex/PPLexerChange.cpp')
| -rw-r--r-- | clang/lib/Lex/PPLexerChange.cpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp index 25a98ae47b6..da6c8aa589e 100644 --- a/clang/lib/Lex/PPLexerChange.cpp +++ b/clang/lib/Lex/PPLexerChange.cpp @@ -16,6 +16,7 @@ #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/LexDiagnostic.h" +#include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" #include "llvm/Support/MemoryBuffer.h" using namespace clang; @@ -211,8 +212,28 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) { CurPPLexer->MIOpt.GetControllingMacroAtEndOfFile()) { // Okay, this has a controlling macro, remember in HeaderFileInfo. if (const FileEntry *FE = - SourceMgr.getFileEntryForID(CurPPLexer->getFileID())) + SourceMgr.getFileEntryForID(CurPPLexer->getFileID())) { HeaderInfo.SetFileControllingMacro(FE, ControllingMacro); + + // Controlling macros are implicitly private. + if (MacroInfo *MI = getMacroInfo( + const_cast<IdentifierInfo *>(ControllingMacro))) { + if (MI->getVisibilityLocation().isInvalid()) { + // FIXME: HACK! Mark controlling macros from system headers as + // exported, along with our own Clang headers. This is a gross + // hack to deal with the fact that system headers are included in + // many places within module headers, but are not themselves + // modularized. + if ((StringRef(FE->getName()).find("lib/clang") + == StringRef::npos) && + (StringRef(FE->getName()).find("usr/include") + == StringRef::npos) && + (StringRef(FE->getName()).find("usr/local/include") + == StringRef::npos)) + MI->setVisibility(false, SourceLocation()); + } + } + } } } |
