diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-11 23:46:11 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-11 23:46:11 +0000 |
| commit | c785276b926f57d6c606cebc1392facc61d18529 (patch) | |
| tree | 26aa332f958bcfadbf92e0eb4621fb0afff8cea3 /clang/test/Modules/submodules-merge-defs.cpp | |
| parent | 81d1cc00b7d6de7303deb31ab8569ff3fa4abf56 (diff) | |
| download | bcm5719-llvm-c785276b926f57d6c606cebc1392facc61d18529.tar.gz bcm5719-llvm-c785276b926f57d6c606cebc1392facc61d18529.zip | |
[modules] Fix crash with multiple levels of default template argument merging.
llvm-svn: 239575
Diffstat (limited to 'clang/test/Modules/submodules-merge-defs.cpp')
| -rw-r--r-- | clang/test/Modules/submodules-merge-defs.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index 6884f56ce7d..e7c0ad7f0c1 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -40,6 +40,9 @@ 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}} +J<> pre_j; // expected-error {{must be imported}} expected-error {{too few}} +// expected-note@defs.h:49 +{{here}} + // Make definitions from second module visible. #ifdef TEXTUAL #include "import-and-redefine.h" @@ -65,3 +68,6 @@ int post_fg = F<char>().g<int>(); // expected-error@-5 {{no matching member function}} // expected-note@defs.h:34 {{substitution failure}} #endif +J<> post_j; +template<typename T, int N, template<typename> class K> struct J; +J<> post_j2; |
