git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

c++: Fix templated convertion operator demangling 

Instantiations of templated conversion operators failed to demangle
for cases such as 'operator X<int>', but worked for 'operator X<int>
&', due to thinking the template instantiation of X was the
instantiation of the conversion operator itself.

	libiberty/
	* cp-demangle.c (d_print_conversion): Remove incorrect
	template instantiation handling.
	* testsuite/demangle-expected: Add testcases.
This commit is contained in:
Nathan Sidwell 2023-06-12 19:37:04 -04:00
parent a54c71ccc2
commit 5a89703618
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libiberty/cp-demangle.c
View File

@ -6660,32 +6660,10 @@ d_print_conversion (struct d_print_info *dpi, int options,
dpt.template_decl = dpi->current_template;
}
if (d_left (dc)->type != DEMANGLE_COMPONENT_TEMPLATE)
{
d_print_comp (dpi, options, d_left (dc));
if (dpi->current_template != NULL)
dpi->templates = dpt.next;
}
else
{
d_print_comp (dpi, options, d_left (d_left (dc)));
/* For a templated cast operator, we need to remove the template
parameters from scope after printing the operator name,
so we need to handle the template printing here. */
if (dpi->current_template != NULL)
dpi->templates = dpt.next;
if (d_last_char (dpi) == '<')
d_append_char (dpi, ' ');
d_append_char (dpi, '<');
d_print_comp (dpi, options, d_right (d_left (dc)));
/* Avoid generating two consecutive '>' characters, to avoid
the C++ syntactic ambiguity. */
if (d_last_char (dpi) == '>')
d_append_char (dpi, ' ');
d_append_char (dpi, '>');
}
}
/* Initialize the information structure we use to pass around

27
libiberty/testsuite/demangle-expected
View File

@ -1662,3 +1662,30 @@ X<int>::F()::{lambda(int)#1}::operator()(int) const
_Z1fIiEv1AIXnxtlT_EEE
void f<int>(A<noexcept(int{})>)
_ZNO1Ycv1XEv
Y::operator X() &&
_ZNO1Ycv1XIT_EIvEEv
Y::operator X<void><void>() &&
_ZNO1Y3bobEv
Y::bob() &&
_ZNR1Y3bobEv
Y::bob() &
_ZNKR1YcvRK1XIT_EIvEEv
Y::operator X<void> const&<void>() const &
_ZZN1XIiEcviEvE1y
X<int>::operator int()::y
_ZZN1XIiEcv1ZIiEEvE1y
X<int>::operator Z<int>()::y
_ZZN1Xcv1ZIT_EIiEEvE1y
X::operator Z<int><int>()::y
_ZZN1XIfEcv1ZIT_EIiEEvE1y
X<float>::operator Z<int><int>()::y