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

cp-demangle.c (d_demangle): If DMGL_PARAMS is not set, don't expect that we've read the entire string.

Browse Source 
* cp-demangle.c (d_demangle): If DMGL_PARAMS is not set, don't
	expect that we've read the entire string.
	(is_ctor_or_dtor): Don't expect that we've read the entire
	string--reverse patch of 2003-11-29.

From-SVN: r74651
This commit is contained in:
Ian Lance Taylor 2003-12-15 23:18:49 +00:00 committed by Ian Lance Taylor
parent b95cc51a28
commit 8d686df280
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libiberty/ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-15 Ian Lance Taylor <ian@wasabisystems.com>
* cp-demangle.c (d_demangle): If DMGL_PARAMS is not set, don't
expect that we've read the entire string.
(is_ctor_or_dtor): Don't expect that we've read the entire
string--reverse patch of 2003-11-29.
2003-12-15 Brendan Kehoe <brendan@zen.org>
* libiberty/Makefile.in (floatformat.o): Add dependency on

64
libiberty/cp-demangle.c
View File

@ -3622,9 +3622,11 @@ d_demangle (mangled, options, palc)
else
dc = d_type (&di);
/* If we didn't consume the entire mangled string, then we didn't
successfully demangle it. */
if (d_peek_char (&di) != '\0')
/* If DMGL_PARAMS is set, then if we didn't consume the entire
mangled string, then we didn't successfully demangle it. If
DMGL_PARAMS is not set, we didn't look at the trailing
parameters. */
if (((options & DMGL_PARAMS) != 0) && d_peek_char (&di) != '\0')
dc = NULL;
#ifdef CP_DEMANGLE_DEBUG
@ -3829,37 +3831,37 @@ is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
dc = d_mangled_name (&di, 1);
/* Note that because we did not pass DMGL_PARAMS, we don't expect to
demangle the entire string. */
ret = 0;
if (d_peek_char (&di) == '\0')
while (dc != NULL)
{
while (dc != NULL)
switch (dc->type)
{
switch (dc->type)
{
default:
dc = NULL;
break;
case D_COMP_TYPED_NAME:
case D_COMP_TEMPLATE:
case D_COMP_RESTRICT_THIS:
case D_COMP_VOLATILE_THIS:
case D_COMP_CONST_THIS:
dc = d_left (dc);
break;
case D_COMP_QUAL_NAME:
dc = d_right (dc);
break;
case D_COMP_CTOR:
*ctor_kind = dc->u.s_ctor.kind;
ret = 1;
dc = NULL;
break;
case D_COMP_DTOR:
*dtor_kind = dc->u.s_dtor.kind;
ret = 1;
dc = NULL;
break;
}
default:
dc = NULL;
break;
case D_COMP_TYPED_NAME:
case D_COMP_TEMPLATE:
case D_COMP_RESTRICT_THIS:
case D_COMP_VOLATILE_THIS:
case D_COMP_CONST_THIS:
dc = d_left (dc);
break;
case D_COMP_QUAL_NAME:
dc = d_right (dc);
break;
case D_COMP_CTOR:
*ctor_kind = dc->u.s_ctor.kind;
ret = 1;
dc = NULL;
break;
case D_COMP_DTOR:
*dtor_kind = dc->u.s_dtor.kind;
ret = 1;
dc = NULL;
break;
}
}