[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
diff --git a/clang/test/Modules/submodules-merge-defs.cpp b/clang/test/Modules/submodules-merge-defs.cpp
index a11ae46..ee5e4fe 100644
--- a/clang/test/Modules/submodules-merge-defs.cpp
+++ b/clang/test/Modules/submodules-merge-defs.cpp
@@ -50,12 +50,11 @@
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}}