[cfe-commits] r148117 - in /cfe/trunk: lib/Lex/ModuleMap.cpp test/Modules/auto-module-import.m
Douglas Gregor
dgregor at apple.com
Fri Jan 13 08:54:27 PST 2012
Author: dgregor
Date: Fri Jan 13 10:54:27 2012
New Revision: 148117
URL: http://llvm.org/viewvc/llvm-project?rev=148117&view=rev
Log:
Don't infer a submodule for a framework's private header, at least for now.
Modified:
cfe/trunk/lib/Lex/ModuleMap.cpp
cfe/trunk/test/Modules/auto-module-import.m
Modified: cfe/trunk/lib/Lex/ModuleMap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ModuleMap.cpp?rev=148117&r1=148116&r2=148117&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/ModuleMap.cpp (original)
+++ cfe/trunk/lib/Lex/ModuleMap.cpp Fri Jan 13 10:54:27 2012
@@ -341,20 +341,7 @@
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;
}
Modified: cfe/trunk/test/Modules/auto-module-import.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/auto-module-import.m?rev=148117&r1=148116&r2=148117&view=diff
==============================================================================
--- cfe/trunk/test/Modules/auto-module-import.m (original)
+++ cfe/trunk/test/Modules/auto-module-import.m Fri Jan 13 10:54:27 2012
@@ -54,7 +54,7 @@
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; }
More information about the cfe-commits
mailing list