From aca9a742412283942e03eab72a639414dc191e1d Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sun, 13 Feb 2005 06:58:55 +0000 Subject: [PATCH] * cp-demangle.c (__cxa_demangle): Change resolution of ambiguous arguments. --- libiberty/ChangeLog | 5 +++++ libiberty/cp-demangle.c | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index adbb249812..1d801adf38 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2005-02-13 Jason Merrill + + * cp-demangle.c (__cxa_demangle): Change resolution of ambiguous + arguments. + 2005-01-11 Tobias Schl"uter * hex.c (hex_value): Group 'unsigned int' together to get correct diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 5707aa20aa..c4436d7d7d 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -4047,21 +4047,6 @@ __cxa_demangle (mangled_name, output_buffer, length, status) return NULL; } - /* The specification for __cxa_demangle() is that if the mangled - name could be either an extern "C" identifier, or an internal - built-in type name, then we resolve it as the identifier. All - internal built-in type names are a single lower case character. - Frankly, this simplistic disambiguation doesn't make sense to me, - but it is documented, so we implement it here. */ - if (IS_LOWER (mangled_name[0]) - && mangled_name[1] == '\0' - && cplus_demangle_builtin_types[mangled_name[0] - 'a'].name != NULL) - { - if (status != NULL) - *status = -2; - return NULL; - } - demangled = d_demangle (mangled_name, DMGL_PARAMS | DMGL_TYPES, &alc); if (demangled == NULL)