diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-13 18:26:47 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2017-03-13 20:51:42 +0100 |
| commit | b9da89d161e3903faa335f444af2bf05e40f926e (patch) | |
| tree | 0fbdb729ff3259739ed1e64802cf9a25a641f26f | |
| parent | c793cac124dd2eb34042f2e43abb099a26e34cb0 (diff) | |
| download | gdb-b9da89d161e3903faa335f444af2bf05e40f926e.zip gdb-b9da89d161e3903faa335f444af2bf05e40f926e.tar.gz gdb-b9da89d161e3903faa335f444af2bf05e40f926e.tar.bz2 | |
Merge libiberty: Initialize d_printing in all cplus_demangle_fill_* functions.
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.
gdb/ChangeLog:
* cp-name-parser.y (make_empty): Initialize d_printing to zero.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/cp-name-parser.y | 1 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 8 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 4 |
4 files changed, 17 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e4c4432..7de2498 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-03-13 Mark Wielaard <mark@klomp.org> + + * cp-name-parser.y (make_empty): Initialize d_printing to zero. + 2017-03-10 Keith Seitz <keiths@redhat.com> PR c++/8218 diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index fd1e949..5278c05 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -201,6 +201,7 @@ make_empty (enum demangle_component_type d_type) { struct demangle_component *ret = d_grab (); ret->type = d_type; + ret->d_printing = 0; return ret; } diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index e93e327..b513fce 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -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> PR demangler/70909 diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 341a418..04832ff 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -854,6 +854,7 @@ cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len) { if (p == NULL || s == NULL || len == 0) return 0; + p->d_printing = 0; p->type = DEMANGLE_COMPONENT_NAME; p->u.s_name.s = s; 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) return 0; + p->d_printing = 0; p->type = DEMANGLE_COMPONENT_EXTENDED_OPERATOR; p->u.s_extended_operator.args = args; 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_object_ctor_group) return 0; + p->d_printing = 0; p->type = DEMANGLE_COMPONENT_CTOR; p->u.s_ctor.kind = kind; 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_object_dtor_group) return 0; + p->d_printing = 0; p->type = DEMANGLE_COMPONENT_DTOR; p->u.s_dtor.kind = kind; p->u.s_dtor.name = name; |