diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiation-depth.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 0756ae5070..bbabb46c11 100644 --- 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 20a5c2431b..a2b9d2eb15 100644 --- 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() { |