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
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp
index 55fa508..745ebc4 100644
--- a/lib/Lex/ModuleMap.cpp
+++ b/lib/Lex/ModuleMap.cpp
@@ -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;
}
diff --git a/test/Modules/auto-module-import.m b/test/Modules/auto-module-import.m
index 429501c..fbd0a54 100644
--- a/test/Modules/auto-module-import.m
+++ b/test/Modules/auto-module-import.m
@@ -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; }