diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-04-21 05:40:43 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-04-21 05:40:43 +0000 |
| commit | 58c65652a8f99e874c6aa1c272fcb199a81ab274 (patch) | |
| tree | d745d8664cbb018a97f0ccfc7cc3d1c89f816533 | |
| parent | 87e049558e0719e06fcb294bbc5a4e302df5d5f8 (diff) | |
| download | bcm5719-llvm-58c65652a8f99e874c6aa1c272fcb199a81ab274.tar.gz bcm5719-llvm-58c65652a8f99e874c6aa1c272fcb199a81ab274.zip | |
Reword the note we emit when suppressing template instantiation contexts, per John's advice
llvm-svn: 101988
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/instantiation-depth.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 0756ae50704..bbabb46c115 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/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/clang/test/SemaTemplate/instantiation-depth.cpp b/clang/test/SemaTemplate/instantiation-depth.cpp index 20a5c2431b6..a2b9d2eb151 100644 --- a/clang/test/SemaTemplate/instantiation-depth.cpp +++ b/clang/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() { |
