diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-17 20:39:41 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-17 20:39:41 +0000 |
| commit | 63e09bf70b65610e54837b57e6fca0c5492db8df (patch) | |
| tree | d08e6e9ab31683f906ea93d8cd5037885a9a53f2 /clang/test/Modules/submodules-merge-defs.cpp | |
| parent | bb71f7d25106b366a31ab74d8c03eeda99d6a64f (diff) | |
| download | bcm5719-llvm-63e09bf70b65610e54837b57e6fca0c5492db8df.tar.gz bcm5719-llvm-63e09bf70b65610e54837b57e6fca0c5492db8df.zip | |
[modules] If we merge a template, also track that its parameters are merged so
that we know when its default arguments should be visible.
llvm-svn: 239936
Diffstat (limited to 'clang/test/Modules/submodules-merge-defs.cpp')
| -rw-r--r-- | clang/test/Modules/submodules-merge-defs.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp index a11ae46aefc..ee5e4fe1bfd 100644 --- a/clang/test/Modules/submodules-merge-defs.cpp +++ b/clang/test/Modules/submodules-merge-defs.cpp @@ -50,12 +50,11 @@ int pre_fg = F<int>().g<int>(); // expected-error +{{must be imported}} J<> pre_j; // expected-error {{declaration of 'J' must be imported}} #ifdef IMPORT_USE_2 -// FIXME-error-re@-2 {{default argument of 'J' must be imported from one of {{.*}}stuff.use{{.*}}stuff.use-2}} -// expected-error@-3 {{default argument of 'J' must be imported from module 'stuff.use'}} +// expected-error-re@-2 {{default argument of 'J' must be imported from one of {{.*}}stuff.use{{.*}}stuff.use-2}} #elif EARLY_INDIRECT_INCLUDE -// expected-error@-5 {{default argument of 'J' must be imported from module 'merged-defs'}} +// expected-error@-4 {{default argument of 'J' must be imported from module 'merged-defs'}} #else -// expected-error@-7 {{default argument of 'J' must be imported from module 'stuff.use'}} +// expected-error@-6 {{default argument of 'J' must be imported from module 'stuff.use'}} #endif // expected-note@defs.h:49 +{{here}} |
