[cfe-commits] r101988 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td test/SemaTemplate/instantiation-depth.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Apr 21 00:40:43 2010
New Revision: 101988

URL: http://llvm.org/viewvc/llvm-project?rev=101988&view=rev
Log:
Reword the note we emit when suppressing template instantiation contexts, per John's advice

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/test/SemaTemplate/instantiation-depth.cpp

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=101988&r1=101987&r2=101988&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Apr 21 00:40:43 2010
@@ -1435,8 +1435,8 @@
 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">;

Modified: cfe/trunk/test/SemaTemplate/instantiation-depth.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiation-depth.cpp?rev=101988&r1=101987&r2=101988&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiation-depth.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiation-depth.cpp Wed Apr 21 00:40:43 2010
@@ -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() {