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

libiberty: Initialize d_printing in all cplus_demangle_fill_* functions.

Browse Source 
While integrating the d_printing recursion guard change into gdb I
noticed we forgot to initialize the demangle_component d_printing
field in cplus_demangle_fill_{name,extended_operator,ctor,dtor}.
As is done in cplus_demangle_fill_{component,builtin_type,operator}.
It happened to work because in gcc all demangle_components were
allocated through d_make_empty. But gdb has its own allocation
mechanism (as might other users).

libiberty/ChangeLog:

       * cp-demangle.c (cplus_demangle_fill_name): Initialize
       demangle_component d_printing.
       (cplus_demangle_fill_extended_operator): Likewise.
       (cplus_demangle_fill_ctor): Likewise.
       (cplus_demangle_fill_dtor): Likewise.

From-SVN: r246105
This commit is contained in:
Mark Wielaard 2017-03-13 18:26:47 +00:00 committed by Mark Wielaard
parent fd231ad75a
commit 9905ca975c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libiberty/ChangeLog
View File

@ -1,3 +1,11 @@
2017-03-12 Mark Wielaard <mark@klomp.org>
* cp-demangle.c (cplus_demangle_fill_name): Initialize
demangle_component d_printing.
(cplus_demangle_fill_extended_operator): Likewise.
(cplus_demangle_fill_ctor): Likewise.
(cplus_demangle_fill_dtor): Likewise.
2017-03-08 Mark Wielaard <mark@klomp.org> 2017-03-08 Mark Wielaard <mark@klomp.org>
PR demangler/70909 PR demangler/70909

4
libiberty/cp-demangle.c
View File

@ -854,6 +854,7 @@ cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
{ {
if (p == NULL || s == NULL || len == 0) if (p == NULL || s == NULL || len == 0)
return 0; return 0;
p->d_printing = 0;
p->type = DEMANGLE_COMPONENT_NAME; p->type = DEMANGLE_COMPONENT_NAME;
p->u.s_name.s = s; p->u.s_name.s = s;
p->u.s_name.len = len; p->u.s_name.len = len;
@ -869,6 +870,7 @@ cplus_demangle_fill_extended_operator (struct demangle_component *p, int args,
{ {
if (p == NULL || args < 0 || name == NULL) if (p == NULL || args < 0 || name == NULL)
return 0; return 0;
p->d_printing = 0;
p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR; p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR;
p->u.s_extended_operator.args = args; p->u.s_extended_operator.args = args;
p->u.s_extended_operator.name = name; p->u.s_extended_operator.name = name;
@ -888,6 +890,7 @@ cplus_demangle_fill_ctor (struct demangle_component *p,
|| (int) kind < gnu_v3_complete_object_ctor || (int) kind < gnu_v3_complete_object_ctor
|| (int) kind > gnu_v3_object_ctor_group) || (int) kind > gnu_v3_object_ctor_group)
return 0; return 0;
p->d_printing = 0;
p->type = DEMANGLE_COMPONENT_CTOR; p->type = DEMANGLE_COMPONENT_CTOR;
p->u.s_ctor.kind = kind; p->u.s_ctor.kind = kind;
p->u.s_ctor.name = name; p->u.s_ctor.name = name;
@ -907,6 +910,7 @@ cplus_demangle_fill_dtor (struct demangle_component *p,
|| (int) kind < gnu_v3_deleting_dtor || (int) kind < gnu_v3_deleting_dtor
|| (int) kind > gnu_v3_object_dtor_group) || (int) kind > gnu_v3_object_dtor_group)
return 0; return 0;
p->d_printing = 0;
p->type = DEMANGLE_COMPONENT_DTOR; p->type = DEMANGLE_COMPONENT_DTOR;
p->u.s_dtor.kind = kind; p->u.s_dtor.kind = kind;
p->u.s_dtor.name = name; p->u.s_dtor.name = name;