procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: mangle noexcept-expr [PR70790]

Browse source 
This implements noexcept(expr) mangling and demangling as per the
Itanium ABI.

	PR c++/70790

gcc/cp/ChangeLog:

	* mangle.cc (write_expression): Handle NOEXCEPT_EXPR.

libiberty/ChangeLog:

	* cp-demangle.c (cplus_demangle_operators): Add the noexcept
	operator.
	(d_print_comp_inner) <case DEMANGLE_COMPONENT_UNARY>: Always
	print parens around the operand of noexcept too.
	* testsuite/demangle-expected: Test noexcept operator
	demangling.

gcc/testsuite/ChangeLog:

	* g++.dg/abi/mangle78.C: New test.
This commit is contained in:
Patrick Palka 2023-06-03 09:03:27 -04:00
parent 38e88d41f5
commit 999e617d31
4 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/mangle.cc
View file

@ -3402,6 +3402,11 @@ write_expression (tree expr)
else
write_string ("tr");
}
else if (code == NOEXCEPT_EXPR)
{
write_string ("nx");
write_expression (TREE_OPERAND (expr, 0));
}
else if (code == CONSTRUCTOR)
{
bool braced_init = BRACE_ENCLOSED_INITIALIZER_P (expr);

14
gcc/testsuite/g++.dg/abi/mangle78.C Normal file
View file

@ -0,0 +1,14 @@
// PR c++/70790
// { dg-do compile { target c++11 } }
template<bool B>
struct A { };
template<class T>
void f(A<noexcept(T{})>);
int main() {
f<int>({});
}
// { dg-final { scan-assembler "_Z1fIiEv1AIXnxtlT_EEE" } }

5
libiberty/cp-demangle.c
View file

@ -1947,6 +1947,7 @@ const struct demangle_operator_info cplus_demangle_operators[] =
{ "ng", NL ("-"), 1 },
{ "nt", NL ("!"), 1 },
{ "nw", NL ("new"), 3 },
{ "nx", NL ("noexcept"), 1 },
{ "oR", NL ("|="), 2 },
{ "oo", NL ("||"), 2 },
{ "or", NL ("|"), 2 },
@ -5836,8 +5837,8 @@ d_print_comp_inner (struct d_print_info *dpi, int options,
if (code && !strcmp (code, "gs"))
/* Avoid parens after '::'. */
d_print_comp (dpi, options, operand);
else if (code && !strcmp (code, "st"))
/* Always print parens for sizeof (type). */
else if (code && (!strcmp (code, "st") || !strcmp (code, "nx")))
/* Always print parens for sizeof (type) and noexcept(expr). */
{
d_append_char (dpi, '(');
d_print_comp (dpi, options, operand);

3
libiberty/testsuite/demangle-expected
View file

@ -1659,3 +1659,6 @@ auto f()::{lambda<typename $T0>(X<$T0>*, X<int>*)#1}::operator()<char>(X<char>*,
_ZZN1XIiE1FEvENKUliE_clEi
X<int>::F()::{lambda(int)#1}::operator()(int) const
_Z1fIiEv1AIXnxtlT_EEE
void f<int>(A<noexcept(int{})>)