diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-13 16:54:27 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-13 16:54:27 +0000 |
| commit | 3a110f75acafc992cb664200cebec90520986715 (patch) | |
| tree | 924fddaf2033c827efbf9240213fac5ca4b5a9ea | |
| parent | 704e7328a119e6024c9f63b21329bc612098c6dd (diff) | |
Don't infer a submodule for a framework's private header, at least for now.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148117 91177308-0d34-0410-b5e6-96231b3b80d8
| -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; } |