From 09a22f071bae8320c322645d1ff0bc86fadfe1b4 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 13 Jan 2012 16:54:27 +0000 Subject: [PATCH] Don't infer a submodule for a framework's private header, at least for now. llvm-svn: 148117 --- clang/lib/Lex/ModuleMap.cpp | 15 +-------------- clang/test/Modules/auto-module-import.m | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 55fa50809a1c..745ebc4d8b69 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/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/clang/test/Modules/auto-module-import.m b/clang/test/Modules/auto-module-import.m index 429501c4bdb3..fbd0a541b608 100644 --- a/clang/test/Modules/auto-module-import.m +++ b/clang/test/Modules/auto-module-import.m @@ -54,7 +54,7 @@ void testModuleSubFrameworkAgain() { int getDependsOnModulePrivate() { return depends_on_module_private; } -#include // expected-warning{{treating #include as an import of module 'Module.Private.ModulePrivate'}} +#include // includes the header int getModulePrivate() { return module_private; }