From 63e09bf70b65610e54837b57e6fca0c5492db8df Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 17 Jun 2015 20:39:41 +0000 Subject: [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 --- clang/test/Modules/submodules-merge-defs.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'clang/test/Modules/submodules-merge-defs.cpp') 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().g(); // 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}} -- cgit v1.2.3