http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58386
--- Comment #2 from paolo at gcc dot gnu.org <paolo at gcc dot gnu.org> --- Author: paolo Date: Tue Sep 10 18:45:29 2013 New Revision: 202480 URL: http://gcc.gnu.org/viewcvs?rev=202480&root=gcc&view=rev Log: 2013-09-10 Paolo Carlini <paolo.carl...@oracle.com> PR bootstrap/58386 Revert: 2013-09-10 Gary Benson <gben...@redhat.com> * cp-demangle.c: Include hashtab.h. (struct d_print_info): New field saved_scopes. (d_print_init): Initialize the above. (d_print_free): New function. (cplus_demangle_print_callback): Call the above. (struct d_saved_scope): New structure. (d_store_scope): New function. (d_free_scope) Likewise. (d_restore_scope) Likewise. (d_hash_saved_scope) Likewise. (d_equal_saved_scope) Likewise. (d_print_comp): New variable saved_scope. [DEMANGLE_COMPONENT_REFERENCE, DEMANGLE_COMPONENT_RVALUE_REFERENCE]: Capture scope the first time the component is traversed, and use the captured scope for subsequent traversals. Modified: trunk/libiberty/ChangeLog trunk/libiberty/cp-demangle.c trunk/libiberty/testsuite/demangle-expected