diff options
| -rw-r--r-- | lib/Lex/HeaderSearch.cpp | 11 | ||||
| -rw-r--r-- | test/Modules/auto-module-import.m | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp index 7035b9c45d..9a7230c24e 100644 --- a/lib/Lex/HeaderSearch.cpp +++ b/lib/Lex/HeaderSearch.cpp @@ -799,7 +799,16 @@ bool HeaderSearch::loadModuleMapFile(const FileEntry *File) { return !KnownDir->second; bool Result = ModMap.parseModuleMapFile(File); - DirectoryHasModuleMap[Dir] = !Result; + if (!Result && llvm::sys::path::filename(File->getName()) == "module.map") { + // If the file we loaded was a module.map, look for the corresponding + // module_private.map. + llvm::SmallString<128> PrivateFilename(Dir->getName()); + llvm::sys::path::append(PrivateFilename, "module_private.map"); + if (const FileEntry *PrivateFile = FileMgr.getFile(PrivateFilename)) + Result = ModMap.parseModuleMapFile(PrivateFile); + } + + DirectoryHasModuleMap[Dir] = !Result; return Result; } diff --git a/test/Modules/auto-module-import.m b/test/Modules/auto-module-import.m index c1708e8eae..4ddd0e1025 100644 --- a/test/Modules/auto-module-import.m +++ b/test/Modules/auto-module-import.m @@ -42,3 +42,5 @@ void testModuleSubFrameworkAgain() { // Test inclusion of private headers. #include <DependsOnModule/DependsOnModulePrivate.h> // expected-warning{{treating #include as an import of module 'DependsOnModule.Private.DependsOnModule'}} + +int getDependsOnModulePrivate() { return depends_on_module_private; } |