aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/error.c
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2020-04-13 16:53:41 -0400
committerPatrick Palka <ppalka@redhat.com>2020-04-13 16:53:48 -0400
commit1dcb779916502a44b4ae67d6bf60eb59474bd78c (patch)
treef8499f13cfb96cc5bbd20c877718db221455f658 /gcc/cp/error.c
parent077dd9b3f17710da8af6adce816754ddceb57b5a (diff)
downloadgcc-1dcb779916502a44b4ae67d6bf60eb59474bd78c.zip
gcc-1dcb779916502a44b4ae67d6bf60eb59474bd78c.tar.gz
gcc-1dcb779916502a44b4ae67d6bf60eb59474bd78c.tar.bz2
c++: Infinite diagnostic loop with decltype([]{}) [PR94521]
We are hitting a recursive loop when printing the signature of a function containing a decltype([]{}) type. The loop is dump_function_decl -> dump_substitution -> dump_template_bindings -> dump_type -> dump_aggr_type -> dump_scope -> dump_function_decl and we loop because dump_template_bindings wants to print the resolved type of decltype([]{}) (i.e. just a lambda type), so it calls dump_aggr_type, which wants to print the function scope of the lambda type. But the function scope of the lambda type is the function which we're in the middle of printing. This patch breaks the loop by passing TFF_NO_FUNCTION_ARGUMENTS to dump_function_decl from dump_scope, so that we avoid recursing into dump_substitution and ultimately looping. This also means we no longer emit the "[with ...]" clause when printing a function template scope, and we instead just emit its template argument list in a more natural way, e.g. instead of foo(int, char) [with T=bool]::x we would now print foo<bool>::x which seems like an improvement on its own. The full signature of the function 'spam' in the below testcase is now void spam(decltype (<lambda>)*) [with T = int; decltype (<lambda>) = spam<int>::<lambda()>] gcc/cp/ChangeLog: PR c++/94521 * error.c (dump_scope): Pass TFF_NO_FUNCTION_ARGUMENTS to dump_function_decl when printing a function template instantiation as a scope. gcc/testsuite/ChangeLog: PR c++/94521 * g++.dg/cpp2a/lambda-uneval12.C: New test.
Diffstat (limited to 'gcc/cp/error.c')
-rw-r--r--gcc/cp/error.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 61d1218..98c163d 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -211,6 +211,8 @@ dump_scope (cxx_pretty_printer *pp, tree scope, int flags)
}
else if ((flags & TFF_SCOPE) && TREE_CODE (scope) == FUNCTION_DECL)
{
+ if (DECL_USE_TEMPLATE (scope))
+ f |= TFF_NO_FUNCTION_ARGUMENTS;
dump_function_decl (pp, scope, f);
pp_cxx_colon_colon (pp);
}