mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-14 14:33:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR other/46332 (__cxa_demangle yields excess parentheses for function types)

Browse Source 
libiberty/:
	PR other/46332
	* cp-demangle.c (d_print_function_type): Don't print parentheses
	if there are no modifiers to print.
	* testsuite/demangle-expected: Tweak one test case, add another.
libstdc++/:
	* testsuite/abi/demangle/abi_examples/14.cc (main): Change
	expected demangling.

From-SVN: r166695
This commit is contained in:
Ian Lance Taylor 2010-11-13 01:21:12 +00:00 committed by Ian Lance Taylor
parent 3c87e428b0
commit 759fe2404d
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libiberty/ChangeLog
View File

@ -1,3 +1,10 @@
2010-11-12 Ian Lance Taylor <iant@google.com>
PR other/46332
* cp-demangle.c (d_print_function_type): Don't print parentheses
if there are no modifiers to print.
* testsuite/demangle-expected: Tweak one test case, add another.
2010-11-04 Richard Henderson <rth@redhat.com>
* configure.ac (AC_CHECK_HEADERS): Add process.h.

6
libiberty/cp-demangle.c
View File

@ -4546,20 +4546,17 @@ d_print_function_type (struct d_print_info *dpi,
struct d_print_mod *mods)
{
int need_paren;
int saw_mod;
int need_space;
struct d_print_mod *p;
struct d_print_mod *hold_modifiers;
need_paren = 0;
saw_mod = 0;
need_space = 0;
for (p = mods; p != NULL; p = p->next)
{
if (p->printed)
break;
saw_mod = 1;
switch (p->mod->type)
{
case DEMANGLE_COMPONENT_POINTER:
@ -4588,9 +4585,6 @@ d_print_function_type (struct d_print_info *dpi,
break;
}
if (d_left (dc) != NULL && ! saw_mod)
need_paren = 1;
if (need_paren)
{
if (! need_space)

9
libiberty/testsuite/demangle-expected
View File

@ -3325,8 +3325,13 @@ first<Duo>
#
--format=gnu-v3 --no-params
_Z3fooIiFvdEiEvv
void foo<int, void ()(double), int>()
foo<int, void ()(double), int>
void foo<int, void (double), int>()
foo<int, void (double), int>
#
--format=gnu-v3 --no-params
_Z1fIFvvEEvv
void f<void ()>()
f<void ()>
#
--format=gnu-v3 --no-params
_ZN1N1fE

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2010-11-12 Ian Lance Taylor <iant@google.com>
PR other/46332
* testsuite/abi/demangle/abi_examples/14.cc (main): Change
expected demangling.
2010-11-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (forward): Implement N3143, resolving US 90.

2
libstdc++-v3/testsuite/abi/demangle/abi_examples/14.cc
View File

@ -33,7 +33,7 @@ int main()
template void foo<int, fun, int>();
*/
//demangle("_Z3fooIiPFidEiEvv", "void foo<int, int (*)(double), int>(void)");
verify_demangle("_Z3fooIiFvdEiEvv", "void foo<int, void ()(double), int>()");
verify_demangle("_Z3fooIiFvdEiEvv", "void foo<int, void (double), int>()");
return 0;
}