OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cp-demangle.c (cplus_demangle_operators): Add li. 

* cp-demangle.c (cplus_demangle_operators): Add li.
	(d_unqualified_name): Handle it specially.

From-SVN: r185704
This commit is contained in:
Jason Merrill 2012-03-22 14:34:16 -04:00 committed by Jason Merrill
parent a8277c363f
commit a896a0dbc1
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -1,3 +1,8 @@
2012-03-22 Jason Merrill <jason@redhat.com>
* cp-demangle.c (cplus_demangle_operators): Add li.
(d_unqualified_name): Handle it specially.
2012-03-22 Release Manager
* GCC 4.7.0 released.

8
libiberty/cp-demangle.c
View File

@ -1419,7 +1419,12 @@ d_unqualified_name (struct d_info *di)
ret = d_operator_name (di);
if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR)
di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
{
di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
if (!strcmp (ret->u.s_operator.op->code, "li"))
ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret,
d_source_name (di));
}
return ret;
}
else if (peek == 'C' || peek == 'D')
@ -1596,6 +1601,7 @@ const struct demangle_operator_info cplus_demangle_operators[] =
{ "ix", NL ("[]"), 2 },
{ "lS", NL ("<<="), 2 },
{ "le", NL ("<="), 2 },
{ "li", NL ("operator\"\" "), 1 },
{ "ls", NL ("<<"), 2 },
{ "lt", NL ("<"), 2 },
{ "mI", NL ("-="), 2 },

2
libiberty/testsuite/demangle-expected
View File

@ -4073,6 +4073,8 @@ decltype (g({parm#1}, {})) f1<int>(int)
_Z2f1IiEDTnw_T_ilEES0_
decltype (new int{}) f1<int>(int)
--format=gnu-v3
_Zli2_wPKc
operator"" _w(char const*)
_Z1fIiEDTnw_Dapifp_EET_
decltype (new auto({parm#1})) f<int>(int)
--format=gnu-v3