commit 0ab544f1a57cb1cb4d6d977c9477ad44c2b87af8
author Daniel Jasper <djasper@google.com> Fri Mar 13 14:29:39 2015 +0000
committer Daniel Jasper <djasper@google.com> Fri Mar 13 14:29:39 2015 +0000
tree d5ff3c7ec3fc2d5ff8605f82d2a5079cd99fc37f
parent 281347aa5992f34b8609efe1e162aa9a0260eb4a

When building a module, all headers of submodules can be used.

This extends r232159.

llvm-svn: 232168

clang/lib/Lex/ModuleMap.cpp

diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 6aefb03..b0195af 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -265,7 +265,8 @@
   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.