diff options
| author | Andrew Burgess <aburgess@broadcom.com> | 2014-08-29 19:30:10 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-08-29 15:30:10 -0400 |
| commit | 606f9e78c690cf9f1a37d7939b0e279878a29cd7 (patch) | |
| tree | 2ebe74bdae8665e07009d648c0a9416f85dc8405 /libiberty | |
| parent | fa794dc63e7aaf35c5e199ac5100b17bbc70c74d (diff) | |
| download | gcc-606f9e78c690cf9f1a37d7939b0e279878a29cd7.zip gcc-606f9e78c690cf9f1a37d7939b0e279878a29cd7.tar.gz gcc-606f9e78c690cf9f1a37d7939b0e279878a29cd7.tar.bz2 | |
cp-demangle.c (d_dump): Only access field from s_fixed part of the union for DEMANGLE_COMPONENT_FIXED_TYPE.
* cp-demangle.c (d_dump): Only access field from s_fixed part of
the union for DEMANGLE_COMPONENT_FIXED_TYPE.
(d_count_templates_scopes): Likewise.
From-SVN: r214740
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 10 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 5 |
3 files changed, 19 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 96064ac..10a5afa 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2014-08-29 Andrew Burgess <aburgess@broadcom.com> + + * cp-demangle.c (d_dump): Only access field from s_fixed part of + the union for DEMANGLE_COMPONENT_FIXED_TYPE. + (d_count_templates_scopes): Likewise. + 2014-08-13 Gary Benson <gbenson@redhat.com> * testsuite/demangler-fuzzer.c: New file. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index c0d2ffe..4ecdb1e 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -713,7 +713,9 @@ d_dump (struct demangle_component *dc, int indent) printf ("pointer to member type\n"); break; case DEMANGLE_COMPONENT_FIXED_TYPE: - printf ("fixed-point type\n"); + printf ("fixed-point type, accum? %d, sat? %d\n", + dc->u.s_fixed.accum, dc->u.s_fixed.sat); + d_dump (dc->u.s_fixed.length, indent + 2) break; case DEMANGLE_COMPONENT_ARGLIST: printf ("argument list\n"); @@ -3875,7 +3877,6 @@ d_count_templates_scopes (int *num_templates, int *num_scopes, case DEMANGLE_COMPONENT_FUNCTION_TYPE: case DEMANGLE_COMPONENT_ARRAY_TYPE: case DEMANGLE_COMPONENT_PTRMEM_TYPE: - case DEMANGLE_COMPONENT_FIXED_TYPE: case DEMANGLE_COMPONENT_VECTOR_TYPE: case DEMANGLE_COMPONENT_ARGLIST: case DEMANGLE_COMPONENT_TEMPLATE_ARGLIST: @@ -3920,6 +3921,11 @@ d_count_templates_scopes (int *num_templates, int *num_scopes, dc->u.s_extended_operator.name); break; + case DEMANGLE_COMPONENT_FIXED_TYPE: + d_count_templates_scopes (num_templates, num_scopes, + dc->u.s_fixed.length); + break; + case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS: case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS: d_count_templates_scopes (num_templates, num_scopes, diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 864ee7e..f8420ef 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -4343,6 +4343,11 @@ cereal::detail::InputBindingMap<cereal::JSONInputArchive>::Serializers cereal::p --format=gnu-v3 _ZNSt9_Any_data9_M_accessIPZ4postISt8functionIFvvEEEvOT_EUlvE_EERS5_v void post<std::function<void ()> >(std::function<void ()>&&)::{lambda()#1}*& std::_Any_data::_M_access<void post<std::function<void ()> >(void post<std::function<void ()> >(std::function<void ()>&&)::{lambda()#1}*&&)::{lambda()#1}*>() +# +--format=auto --no-params +_Z3xxxDFyuVb +xxx(unsigned long long _Fract, bool volatile) +xxx # https://sourceware.org/bugzilla/show_bug.cgi?id=16817 --format=auto --no-params _QueueNotification_QueueController__$4PPPPPPPM_A_INotice___Z |