diff options
Diffstat (limited to 'clang/test/Modules')
4 files changed, 25 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/submodules-merge-defs/defs.h b/clang/test/Modules/Inputs/submodules-merge-defs/defs.h index 68b57a4a62f..d65e93bf72b 100644 --- a/clang/test/Modules/Inputs/submodules-merge-defs/defs.h +++ b/clang/test/Modules/Inputs/submodules-merge-defs/defs.h @@ -46,3 +46,11 @@ namespace G { template<typename T = int, int N = 3, template<typename> class K = F> int H(int a = 1); template<typename T = int, int N = 3, template<typename> class K = F> using I = decltype(H<T, N, K>()); + +namespace NS { + struct A {}; + template<typename T> struct B {}; + template<typename T> struct B<T*> {}; + template<> struct B<int> {}; + inline void f() {} +} diff --git a/clang/test/Modules/Inputs/submodules-merge-defs/indirect.h b/clang/test/Modules/Inputs/submodules-merge-defs/indirect.h new file mode 100644 index 00000000000..28baa019b22 --- /dev/null +++ b/clang/test/Modules/Inputs/submodules-merge-defs/indirect.h @@ -0,0 +1 @@ +#include "merged-defs.h" diff --git a/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap b/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap index 82abdb088f1..f8ae60fe44f 100644 --- a/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap +++ b/clang/test/Modules/Inputs/submodules-merge-defs/module.modulemap @@ -14,3 +14,8 @@ module "merged-defs" { header "merged-defs.h" use "stuff" } + +module "indirect" { + header "indirect.h" + use "merged-defs" +} diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index 0e2f5d9e546..6884f56ce7d 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -3,9 +3,13 @@ // RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery // RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL // RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodules -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility +// RUN: %clang_cc1 -x c++ -std=c++11 -fmodules-cache-path=%t -fmodule-maps -I %S/Inputs/submodules-merge-defs %s -verify -fno-modules-error-recovery -fmodules-local-submodule-visibility -DTEXTUAL -DEARLY_INDIRECT_INCLUDE // Trigger import of definitions, but don't make them visible. #include "empty.h" +#ifdef EARLY_INDIRECT_INCLUDE +#include "indirect.h" +#endif A pre_a; // expected-error {{must be imported}} expected-error {{must use 'struct'}} // expected-note@defs.h:1 +{{here}} @@ -54,3 +58,10 @@ int post_use_dx = use_dx(post_dx); int post_e = E(0); int post_ff = F<char>().f(); int post_fg = F<char>().g<int>(); +#ifdef EARLY_INDIRECT_INCLUDE +// FIXME: Properly track the owning module for a member specialization. +// expected-error@defs.h:34 {{redefinition}} +// expected-note@defs.h:34 {{previous definition}} +// expected-error@-5 {{no matching member function}} +// expected-note@defs.h:34 {{substitution failure}} +#endif |
