diff --git a/gcc/cp/cxx-pretty-print.cc b/gcc/cp/cxx-pretty-print.cc index 07439993e0b03c8aefb1657bb44b1cad278f6f33..cf301bd7cb32413dd5d6d1371974487a83441699 100644 --- a/gcc/cp/cxx-pretty-print.cc +++ b/gcc/cp/cxx-pretty-print.cc @@ -234,8 +234,12 @@ pp_cxx_template_keyword_if_needed (cxx_pretty_printer *pp, tree scope, tree t) } /* nested-name-specifier: - class-or-namespace-name :: nested-name-specifier(opt) - class-or-namespace-name :: template nested-name-specifier */ + :: + type-name :: + namespace-name :: + computed-type-specifier :: + nested-name-specifier identifier :: + nested-name-specifier template(opt) simple-template-id :: */ static void pp_cxx_nested_name_specifier (cxx_pretty_printer *pp, tree t) @@ -252,7 +256,11 @@ pp_cxx_nested_name_specifier (cxx_pretty_printer *pp, tree t) tree scope = get_containing_scope (t); pp_cxx_nested_name_specifier (pp, scope); pp_cxx_template_keyword_if_needed (pp, scope, t); - pp_cxx_unqualified_id (pp, t); + /* This is a computed-type-specifier. */ + if (TREE_CODE (t) == PACK_INDEX_TYPE || TREE_CODE (t) == DECLTYPE_TYPE) + pp->type_id (t); + else + pp_cxx_unqualified_id (pp, t); pp_cxx_colon_colon (pp); } } diff --git a/gcc/testsuite/g++.dg/diagnostic/decltype1.C b/gcc/testsuite/g++.dg/diagnostic/decltype1.C new file mode 100644 index 0000000000000000000000000000000000000000..8b57b165603d3b108f0a2b2387833fac0c3edf9f --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/decltype1.C @@ -0,0 +1,8 @@ +// PR c++/118139 +// { dg-do compile { target c++20 } } + +template<class T> +struct CW { + using V = typename decltype(T())::type; + static void operator=(int) requires requires(V x) { x; } {} // { dg-error {requires requires\(typename decltype\(T\(\)\)::type x\)} } +};