cp-demangle.c (d_demangle): If DMGL_PARAMS is not set, don't expect that we've read the entire string.
* 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:
parent
b95cc51a28
commit
8d686df280
@ -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
|
||||
|
@ -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,9 +3831,10 @@ 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)
|
||||
{
|
||||
switch (dc->type)
|
||||
@ -3861,7 +3864,6 @@ is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free (di.subs);
|
||||
free (di.comps);
|
||||
|
Loading…
Reference in New Issue
Block a user