diff options
| -rw-r--r-- | lib/Lex/ModuleMap.cpp | 15 | ||||
| -rw-r--r-- | test/Modules/auto-module-import.m | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp index 55fa50809a..745ebc4d8b 100644 --- a/lib/Lex/ModuleMap.cpp +++ b/lib/Lex/ModuleMap.cpp @@ -341,20 +341,7 @@ ModuleMap::inferFrameworkModule(StringRef ModuleName, Result); } } - - // Look for private headers. - llvm::SmallString<128> PrivateHeadersDirName(FrameworkDir->getName()); - llvm::sys::path::append(PrivateHeadersDirName, "PrivateHeaders"); - if (const DirectoryEntry *Dir = FileMgr.getDirectory(PrivateHeadersDirName)) { - Module *Private = findOrCreateModule("Private", Result, - /*IsFramework=*/false, - /*IsExplicit=*/true).first; - setUmbrellaDir(Private, Dir); - Private->InferSubmodules = true; - Private->InferExplicitSubmodules = true; - Private->InferExportWildcard = true; - } - + return Result; } diff --git a/test/Modules/auto-module-import.m b/test/Modules/auto-module-import.m index 429501c4bd..fbd0a541b6 100644 --- a/test/Modules/auto-module-import.m +++ b/test/Modules/auto-module-import.m @@ -54,7 +54,7 @@ void testModuleSubFrameworkAgain() { int getDependsOnModulePrivate() { return depends_on_module_private; } -#include <Module/ModulePrivate.h> // expected-warning{{treating #include as an import of module 'Module.Private.ModulePrivate'}} +#include <Module/ModulePrivate.h> // includes the header int getModulePrivate() { return module_private; } |