diff options
| author | Daniel Jasper <djasper@google.com> | 2015-03-13 14:29:39 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-03-13 14:29:39 +0000 |
| commit | 0ab544f1a57cb1cb4d6d977c9477ad44c2b87af8 (patch) | |
| tree | d5ff3c7ec3fc2d5ff8605f82d2a5079cd99fc37f /clang/lib/Lex/ModuleMap.cpp | |
| parent | 281347aa5992f34b8609efe1e162aa9a0260eb4a (diff) | |
| download | bcm5719-llvm-0ab544f1a57cb1cb4d6d977c9477ad44c2b87af8.tar.gz bcm5719-llvm-0ab544f1a57cb1cb4d6d977c9477ad44c2b87af8.zip | |
When building a module, all headers of submodules can be used.
This extends r232159.
llvm-svn: 232168
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 6aefb035266..b0195af70b6 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -265,7 +265,8 @@ void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule, if (Known != Headers.end()) { for (const KnownHeader &Header : Known->second) { // If 'File' is part of 'RequestingModule' we can definitely include it. - if (Header.getModule() == RequestingModule) + if (Header.getModule() && + Header.getModule()->isSubModuleOf(RequestingModule)) return; // Remember private headers for later printing of a diagnostic. |
