diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-02-08 00:10:48 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-02-08 00:10:48 +0000 |
| commit | 1b58c74af272a1d8228b8161c93a8a018456098e (patch) | |
| tree | a00e8950068520a1697260fdb30ba06d8a44d1d7 /test | |
| parent | 8135886ab74d852a6702b1f5656a0b146abe210a (diff) | |
Teach subframework header lookup to suggest modules <rdar://problem/13176200>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174683 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
7 files changed, 17 insertions, 0 deletions
diff --git a/test/Index/index-module.m b/test/Index/index-module.m index 2fccf75d7b..77dee98b4a 100644 --- a/test/Index/index-module.m +++ b/test/Index/index-module.m @@ -26,6 +26,7 @@ int glob; // CHECK-DMOD-NEXT: [ppIncludedFile]: [[DMOD_PRIVATE_H:.*/Modules/Inputs/DependsOnModule.framework[/\\]PrivateHeaders[/\\]DependsOnModulePrivate.h]] | {{.*}} | hash loc: <invalid> // CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache{{[/\\]}}Module.pcm | loc: [[DMOD_MODULE_H]]:1:2 | name: "Module" | isImplicit: 1 // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_other | {{.*}} | loc: [[DMOD_OTHER_H]]:1:5 +// CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache/DependsOnModule.pcm | loc: {{.*}}SubFramework.h:1:2 | name: "DependsOnModule.SubFramework.Other" | isImplicit: 1 // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework | {{.*}} | loc: [[DMOD_SUB_H]]:2:8 // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework_other | {{.*}} | loc: [[DMOD_SUB_OTHER_H]]:1:9 // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_private | {{.*}} | loc: [[DMOD_PRIVATE_H]]:1:5 diff --git a/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Sub.h b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Sub.h new file mode 100644 index 0000000000..8a7eb8499c --- /dev/null +++ b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Sub.h @@ -0,0 +1 @@ +#include <Sub/Types.h> diff --git a/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Types.h b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Types.h new file mode 100644 index 0000000000..7285c5ffa5 --- /dev/null +++ b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/Headers/Types.h @@ -0,0 +1,4 @@ +struct FrameworkSubStruct { + const char * name; + unsigned version; +}; diff --git a/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h new file mode 100644 index 0000000000..8a7eb8499c --- /dev/null +++ b/test/Modules/Inputs/HasSubModules.framework/Frameworks/Sub.framework/PrivateHeaders/SubPriv.h @@ -0,0 +1 @@ +#include <Sub/Types.h> diff --git a/test/Modules/Inputs/HasSubModules.framework/Headers/HasSubModules.h b/test/Modules/Inputs/HasSubModules.framework/Headers/HasSubModules.h new file mode 100644 index 0000000000..a1bdc4621c --- /dev/null +++ b/test/Modules/Inputs/HasSubModules.framework/Headers/HasSubModules.h @@ -0,0 +1 @@ +#import <Sub/Sub.h> diff --git a/test/Modules/Inputs/HasSubModules.framework/PrivateHeaders/HasSubModulesPriv.h b/test/Modules/Inputs/HasSubModules.framework/PrivateHeaders/HasSubModulesPriv.h new file mode 100644 index 0000000000..7b82058f42 --- /dev/null +++ b/test/Modules/Inputs/HasSubModules.framework/PrivateHeaders/HasSubModulesPriv.h @@ -0,0 +1,2 @@ +#import <Sub/SubPriv.h> + diff --git a/test/Modules/subframeworks.m b/test/Modules/subframeworks.m index efdf896657..22dfcca365 100644 --- a/test/Modules/subframeworks.m +++ b/test/Modules/subframeworks.m @@ -20,3 +20,10 @@ void testSubFrameworkAgain() { CXXOnly cxxonly; #endif + +@import HasSubModules; + +// expected-warning@1{{treating #include as an import of module 'HasSubModules.Sub.Types'}} +#import <HasSubModules/HasSubModulesPriv.h> + +struct FrameworkSubStruct ss; |