c++: Fix pretty printing of TYPENAME_TYPEs

I noticed that in some concepts diagnostic messages, we were printing typename
types incorrectly, e.g. printing remove_reference_t<T> as

  typename remove_reference<T>::remove_reference_t

instead of

  typename remove_reference<T>::type.

Fix this by printing the TYPENAME_TYPE_FULLNAME instead of the TYPE_NAME in
cxx_pretty_printer::simple_type_specifier, which is consistent with how
dump_typename in error.c does it.

gcc/cp/ChangeLog:

	* cxx-pretty-print.c (cxx_pretty_printer::simple_type_specifier)
	[TYPENAME_TYPE]: Print the TYPENAME_TYPE_FULLNAME instead of the
	TYPE_NAME.

gcc/testsuite/ChangeLog:

	* g++.dg/concepts/diagnostic4.C: New test.
This commit is contained in:
Patrick Palka 2020-03-06 13:19:13 -05:00
parent 6733ecaf3f
commit ff0a62841e
4 changed files with 29 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2020-03-08 Patrick Palka <ppalka@redhat.com>
* cxx-pretty-print.c (cxx_pretty_printer::simple_type_specifier)
[TYPENAME_TYPE]: Print the TYPENAME_TYPE_FULLNAME instead of the
TYPE_NAME.
2020-03-06 Nathan Sidwell <nathan@acm.org>
PR c++/94027

View File

@ -1360,7 +1360,7 @@ cxx_pretty_printer::simple_type_specifier (tree t)
case TYPENAME_TYPE:
pp_cxx_ws_string (this, "typename");
pp_cxx_nested_name_specifier (this, TYPE_CONTEXT (t));
pp_cxx_unqualified_id (this, TYPE_NAME (t));
pp_cxx_unqualified_id (this, TYPENAME_TYPE_FULLNAME (t));
break;
default:

View File

@ -1,3 +1,7 @@
2020-03-08 Patrick Palka <ppalka@redhat.com>
* g++.dg/concepts/diagnostic4.C: New test.
2020-03-08 H.J. Lu <hongjiu.lu@intel.com>
PR target/89229

View File

@ -0,0 +1,18 @@
// { dg-do compile { target c++2a } }
template<typename T>
struct remove_reference
{ using type = T; };
template<typename T>
using remove_reference_t = remove_reference<T>::type;
template<typename T>
inline constexpr bool blah = false;
template<typename T>
requires blah<remove_reference_t<T>>
// { dg-message "typename remove_reference<T>::type" "" { target *-*-* } .-1 }
void foo() { }
void bar() { foo<int> (); } // { dg-error "use of" }