r217327 - in /branches/google/gcc-4_9: include/...

[ccoutant at gcc dot gnu dot org]

Author: ccoutant
Date: Tue Nov 11 00:07:15 2014
New Revision: 217327

URL: https://gcc.gnu.org/viewcvs?rev=217327&root=gcc&view=rev
Log:
Backport pending upstream patch to fix demangler crash.

https://gcc.gnu.org/ml/gcc-patches/2014-05/msg02279.html

Google ref: 17891596

2014-05-27  Pedro Alves <palves@redhat.com>

include/
        * demangle.h (enum demangle_component_type)
        <DEMANGLE_COMPONENT_CONVERSION>: New value.

2014-05-27  Pedro Alves <palves@redhat.com>

libiberty/
        * cp-demangle.c (d_demangle_callback, d_make_comp): Handle
        DEMANGLE_COMPONENT_CONVERSION.
        (is_ctor_dtor_or_conversion): Handle DEMANGLE_COMPONENT_CONVERSION
        instead of DEMANGLE_COMPONENT_CAST.
        (d_operator_name): Return a DEMANGLE_COMPONENT_CONVERSION
        component if handling a conversion.
        (d_count_templates_scopes, d_print_comp_inner): Handle
        DEMANGLE_COMPONENT_CONVERSION.
        (d_print_comp_inner): Handle DEMANGLE_COMPONENT_CONVERSION instead
        of DEMANGLE_COMPONENT_CAST.
        (d_print_cast): Rename as ...
        (d_print_conversion): ... this.  Adjust comments.
        (d_print_cast): Rewrite - simply print the left subcomponent.
        * cp-demint.c (cplus_demangle_fill_component): Handle
        DEMANGLE_COMPONENT_CONVERSION.

        * testsuite/demangle-expected: Add tests.

Modified:
    branches/google/gcc-4_9/include/demangle.h
    branches/google/gcc-4_9/libiberty/cp-demangle.c
    branches/google/gcc-4_9/libiberty/cp-demint.c
    branches/google/gcc-4_9/libiberty/testsuite/demangle-expected