diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-03-27 21:57:41 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-03-27 21:57:41 +0000 |
| commit | d6aab59ad1e569b50660159e8128797d179bd768 (patch) | |
| tree | 3cecef1a8b9a4aae8e56bd09d07f137fda9a1d39 /clang/test/Modules/submodules-merge-defs.cpp | |
| parent | afbac28bb3e6f107dc9a8aa831bd121ee6804db4 (diff) | |
| download | bcm5719-llvm-d6aab59ad1e569b50660159e8128797d179bd768.tar.gz bcm5719-llvm-d6aab59ad1e569b50660159e8128797d179bd768.zip | |
[modules] Allow a function template definition if we have a pre-existing but not visible definition of the same template.
llvm-svn: 233430
Diffstat (limited to 'clang/test/Modules/submodules-merge-defs.cpp')
| -rw-r--r-- | clang/test/Modules/submodules-merge-defs.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index 3bc52fee828..79213cae8fa 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -12,21 +12,28 @@ int pre_use_a = use_a(pre_a); // expected-error {{'A' must be imported}} B::Inner2 pre_bi; // expected-error +{{must be imported}} // expected-note@defs.h:4 +{{here}} -// expected-note@defs.h:10 +{{here}} +// expected-note@defs.h:11 +{{here}} C_Base<1> pre_cb1; // expected-error +{{must be imported}} -// expected-note@defs.h:13 +{{here}} -C1 pre_c1; // expected-error +{{must be imported}} expected-error {{must use 'struct'}} // expected-note@defs.h:15 +{{here}} +C1 pre_c1; // expected-error +{{must be imported}} expected-error {{must use 'struct'}} +// expected-note@defs.h:17 +{{here}} C2 pre_c2; // expected-error +{{must be imported}} expected-error {{must use 'struct'}} -// expected-note@defs.h:16 +{{here}} +// expected-note@defs.h:18 +{{here}} D::X pre_dx; // expected-error +{{must be imported}} -// expected-note@defs.h:18 +{{here}} -// expected-note@defs.h:19 +{{here}} +// expected-note@defs.h:20 +{{here}} +// expected-note@defs.h:21 +{{here}} // FIXME: We should warn that use_dx is being used without being imported. int pre_use_dx = use_dx(pre_dx); +int pre_e = E(0); // expected-error {{must be imported}} +// expected-note@defs.h:24 +{{here}} + +int pre_ff = F<int>().f(); // expected-error +{{must be imported}} +int pre_fg = F<int>().g<int>(); // expected-error +{{must be imported}} +// expected-note@defs.h:26 +{{here}} + // Make definitions from second module visible. #ifdef TEXTUAL #include "import-and-redefine.h" @@ -42,3 +49,6 @@ C1 c1; C2 c2; D::X post_dx; 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>(); |
