diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-12-05 17:40:25 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-12-05 17:40:25 +0000 |
| commit | 209977c4d809914a20fd44873876c76cf972a56d (patch) | |
| tree | f89b6ebb0ae6292f7a0909737f8eaa0245d42ba8 | |
| parent | f4ac17e51f9841e05e5cc17d65f27f0d1cc62fcb (diff) | |
Inferred framework modules automatically export anything they import
(i.e., 'export *'), to better match the semantics of headers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145813 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/ModuleMap.cpp | 5 | ||||
| -rw-r--r-- | test/Modules/Inputs/AlsoDependsOnModule.framework/Headers/AlsoDependsOnModule.h | 2 | ||||
| -rw-r--r-- | test/Modules/auto-module-import.c | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp index 02848eef6d..6d227d003e 100644 --- a/lib/Lex/ModuleMap.cpp +++ b/lib/Lex/ModuleMap.cpp @@ -197,9 +197,14 @@ ModuleMap::inferFrameworkModule(StringRef ModuleName, Module *Result = new Module(ModuleName, SourceLocation(), /*IsFramework=*/true); + // umbrella "umbrella-header-name" Result->UmbrellaHeader = UmbrellaHeader; Headers[UmbrellaHeader] = Result; UmbrellaDirs[FrameworkDir] = Result; + + // export * + Result->Exports.push_back(Module::ExportDecl(0, true)); + Modules[ModuleName] = Result; return Result; } diff --git a/test/Modules/Inputs/AlsoDependsOnModule.framework/Headers/AlsoDependsOnModule.h b/test/Modules/Inputs/AlsoDependsOnModule.framework/Headers/AlsoDependsOnModule.h new file mode 100644 index 0000000000..1417e0c4d8 --- /dev/null +++ b/test/Modules/Inputs/AlsoDependsOnModule.framework/Headers/AlsoDependsOnModule.h @@ -0,0 +1,2 @@ +#import <Module/Module.h> // expected-warning{{treating #import as an import of module 'Module'}} + diff --git a/test/Modules/auto-module-import.c b/test/Modules/auto-module-import.c index 1b5ef99590..cebfbc6d29 100644 --- a/test/Modules/auto-module-import.c +++ b/test/Modules/auto-module-import.c @@ -12,3 +12,8 @@ # error DEPENDS_ON_MODULE should have been hidden #endif +Module *mod; // expected-error{{unknown type name 'Module'}} + +#import <AlsoDependsOnModule/AlsoDependsOnModule.h> // expected-warning{{treating #import as an import of module 'AlsoDependsOnModule'}} +Module *mod2; + |