Reword the note we emit when suppressing template instantiation contexts, per John...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101988 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 0756ae507047dbf66fa1b728ef1a9f14a0f72344..bbabb46c115c18a70cb1e2047e9c04ae4ab2000a 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1435,8 +1435,8 @@ def note_prior_template_arg_substitution : Note<
 def note_template_default_arg_checking : Note<
   "while checking a default template argument used here">;
 def note_instantiation_contexts_suppressed : Note<
-  "suppressed %0 template instantiation context%s0; use -ftemplate-backtrace-"
-  "limit=N to change the number of template instantiation entries shown">;
+  "(skipping %0 context%s0 in backtrace; use -ftemplate-backtrace-limit=0 to "
+  "see  all)">;
 
 def err_field_instantiates_to_function : Error<
   "data member instantiated with function type %0">;

diff --git a/test/SemaTemplate/instantiation-depth.cpp b/test/SemaTemplate/instantiation-depth.cpp
index 20a5c2431b649aacf7e081b9f2de8f09b7277fbd..a2b9d2eb1513c02358b51e361540b07dfa518e46 100644 (file)
--- a/test/SemaTemplate/instantiation-depth.cpp
+++ b/test/SemaTemplate/instantiation-depth.cpp
@@ -3,7 +3,7 @@
 template<typename T> struct X : X<T*> { }; \
 // expected-error{{recursive template instantiation exceeded maximum depth of 5}} \
 // expected-note 3 {{instantiation of template class}} \
-// expected-note {{suppressed 2 template instantiation contexts}} \
+// expected-note {{skipping 2 contexts in backtrace}} \
 // expected-note {{use -ftemplate-depth-N to increase recursive template instantiation depth}}
 
 void test() {