diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-04-08 13:13:04 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-04-08 13:13:04 +0000 |
commit | 50996ce1e332334f3fa1913e90992e1128a5abaf (patch) | |
tree | 05724c939b1623aa1ee70e557f614aa269f44e93 /clang/lib/Frontend/FrontendActions.cpp | |
parent | 139d4a3875a2a2d92b96f895498c99796fba9e95 (diff) | |
download | bcm5719-llvm-50996ce1e332334f3fa1913e90992e1128a5abaf.tar.gz bcm5719-llvm-50996ce1e332334f3fa1913e90992e1128a5abaf.zip |
If a header is explicitly included in module A, and excluded from an umbrella
directory in module B, don't include it in module B!
llvm-svn: 205762
Diffstat (limited to 'clang/lib/Frontend/FrontendActions.cpp')
-rw-r--r-- | clang/lib/Frontend/FrontendActions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index 2657c9878b8..3f1d2c6106f 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -213,7 +213,7 @@ collectModuleHeaderIncludes(const LangOptions &LangOpts, FileManager &FileMgr, // If this header is marked 'unavailable' in this module, don't include // it. if (const FileEntry *Header = FileMgr.getFile(Dir->path())) { - if (ModMap.isHeaderInUnavailableModule(Header)) + if (ModMap.isHeaderUnavailableInModule(Header, Module)) continue; Module->addTopHeader(Header); } |