When inferring a module map for a framework, infer subframework
modules for each of its subframeworks.
llvm-svn: 145957
diff --git a/clang/include/clang/Lex/ModuleMap.h b/clang/include/clang/Lex/ModuleMap.h
index 1ef4f67..262e50d 100644
--- a/clang/include/clang/Lex/ModuleMap.h
+++ b/clang/include/clang/Lex/ModuleMap.h
@@ -146,7 +146,8 @@
/// \brief Infer the contents of a framework module map from the given
/// framework directory.
Module *inferFrameworkModule(StringRef ModuleName,
- const DirectoryEntry *FrameworkDir);
+ const DirectoryEntry *FrameworkDir,
+ Module *Parent);
/// \brief Retrieve the module map file containing the definition of the given
/// module.
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
index f090e031..1b969b9 100644
--- a/clang/lib/Lex/HeaderSearch.cpp
+++ b/clang/lib/Lex/HeaderSearch.cpp
@@ -849,7 +849,7 @@
}
// Try to infer a module map.
- return ModMap.inferFrameworkModule(Name, Dir);
+ return ModMap.inferFrameworkModule(Name, Dir, /*Parent=*/0);
}
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 581a5d5..ac5ae1e 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -20,6 +20,7 @@
#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/TargetOptions.h"
#include "llvm/Support/Allocator.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/PathV2.h"
#include "llvm/Support/raw_ostream.h"
@@ -219,17 +220,19 @@
Module *
ModuleMap::inferFrameworkModule(StringRef ModuleName,
- const DirectoryEntry *FrameworkDir) {
+ const DirectoryEntry *FrameworkDir,
+ Module *Parent) {
// Check whether we've already found this module.
- if (Module *Module = findModule(ModuleName))
- return Module;
+ if (Module *Mod = lookupModuleQualified(ModuleName, Parent))
+ return Mod;
+
+ FileManager &FileMgr = SourceMgr->getFileManager();
// Look for an umbrella header.
llvm::SmallString<128> UmbrellaName = StringRef(FrameworkDir->getName());
llvm::sys::path::append(UmbrellaName, "Headers");
llvm::sys::path::append(UmbrellaName, ModuleName + ".h");
- const FileEntry *UmbrellaHeader
- = SourceMgr->getFileManager().getFile(UmbrellaName);
+ const FileEntry *UmbrellaHeader = FileMgr.getFile(UmbrellaName);
// FIXME: If there's no umbrella header, we could probably scan the
// framework to load *everything*. But, it's not clear that this is a good
@@ -237,8 +240,14 @@
if (!UmbrellaHeader)
return 0;
- Module *Result = new Module(ModuleName, SourceLocation(),
- /*IsFramework=*/true);
+ Module *Result = new Module(ModuleName, SourceLocation(), Parent,
+ /*IsFramework=*/true, /*IsExplicit=*/false);
+
+ if (Parent)
+ Parent->SubModules[ModuleName] = Result;
+ else
+ Modules[ModuleName] = Result;
+
// umbrella "umbrella-header-name"
Result->UmbrellaHeader = UmbrellaHeader;
Headers[UmbrellaHeader] = Result;
@@ -251,9 +260,24 @@
Result->InferSubmodules = true;
Result->InferExportWildcard = true;
- // FIXME: Look for subframeworks.
+ // Look for subframeworks.
+ llvm::error_code EC;
+ llvm::SmallString<128> SubframeworksDirName = StringRef(FrameworkDir->getName());
+ llvm::sys::path::append(SubframeworksDirName, "Frameworks");
+ for (llvm::sys::fs::directory_iterator Dir(SubframeworksDirName.str(), EC),
+ DirEnd;
+ Dir != DirEnd && !EC; Dir.increment(EC)) {
+ if (!StringRef(Dir->path()).endswith(".framework"))
+ continue;
+
+ if (const DirectoryEntry *SubframeworkDir
+ = FileMgr.getDirectory(Dir->path())) {
+ // FIXME: Do we want to warn about subframeworks without umbrella headers?
+ inferFrameworkModule(llvm::sys::path::stem(Dir->path()), SubframeworkDir,
+ Result);
+ }
+ }
- Modules[ModuleName] = Result;
return Result;
}
diff --git a/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
new file mode 100644
index 0000000..438fc9c
--- /dev/null
+++ b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
@@ -0,0 +1,4 @@
+#ifndef MODULE_SUBFRAMEWORK_H
+#define MODULE_SUBFRAMEWORK_H
+char *module_subframework;
+#endif
diff --git a/clang/test/Modules/auto-module-import.c b/clang/test/Modules/auto-module-import.c
index 4c71f06..373c041 100644
--- a/clang/test/Modules/auto-module-import.c
+++ b/clang/test/Modules/auto-module-import.c
@@ -29,3 +29,13 @@
void testSubframeworkOtherAgain() {
double *sfo1 = sub_framework_other;
}
+
+void testModuleSubFramework() {
+ char *msf = module_subframework;
+}
+
+#include <Module/../Frameworks/SubFramework.framework/Headers/SubFramework.h> // expected-warning{{treating #include as an import of module 'Module.SubFramework'}}
+
+void testModuleSubFrameworkAgain() {
+ char *msf = module_subframework;
+}
diff --git a/clang/test/Modules/on-demand-build.m b/clang/test/Modules/on-demand-build.m
index 2c6a759..7843014 100644
--- a/clang/test/Modules/on-demand-build.m
+++ b/clang/test/Modules/on-demand-build.m
@@ -16,7 +16,7 @@
OtherClass *other = [Module alloc]; // expected-error{{init}}
}
-#ifdef MODULE_H
-# error MODULE_H should not be hidden
+#ifdef MODULE_SUBFRAMEWORK_H
+# error MODULE_SUBFRAMEWORK_H should be hidden
#endif