FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cp-demangle.c (demangle_ctor_dtor_name): Remove not-in-charge allocating ctor mangling.

Browse source 
* cp-demangle.c (demangle_ctor_dtor_name): Remove not-in-charge
	allocating ctor mangling.
	(demangle_array_type): Handle empty and non-constant array length.

From-SVN: r35210
This commit is contained in:
Alex Samuel 2000-07-23 17:55:13 +00:00 • committed by Alex Samuel
parent 2d0e2e024c
commit 0fac482ed6
2 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libiberty/ChangeLog
View file

@ -1,3 +1,9 @@
2000-07-21 Alex Samuel <samuel@codesourcery.com>
* cp-demangle.c (demangle_ctor_dtor_name): Remove not-in-charge
allocating ctor mangling.
(demangle_array_type): Handle empty and non-constant array length.
2000-07-23 Michael Sokolov <msokolov@ivan.Harhan.ORG> 2000-07-23 Michael Sokolov <msokolov@ivan.Harhan.ORG>
* aclocal.m4 (libiberty_AC_DECLARE_ERRNO): New macro. * aclocal.m4 (libiberty_AC_DECLARE_ERRNO): New macro.

45
libiberty/cp-demangle.c
View file

@ -1738,7 +1738,6 @@ demangle_special_name (dm)
::= C1 # complete object (in-charge) ctor ::= C1 # complete object (in-charge) ctor
::= C2 # base object (not-in-charge) ctor ::= C2 # base object (not-in-charge) ctor
::= C3 # complete object (in-charge) allocating ctor ::= C3 # complete object (in-charge) allocating ctor
::= C4 # base object (not-in-charge) allocating ctor
::= D0 # deleting (in-charge) dtor ::= D0 # deleting (in-charge) dtor
::= D1 # complete object (in-charge) dtor ::= D1 # complete object (in-charge) dtor
::= D2 # base object (not-in-charge) dtor */ ::= D2 # base object (not-in-charge) dtor */
@ -1751,8 +1750,7 @@ demangle_ctor_dtor_name (dm)
{ {
"in-charge", "in-charge",
"not-in-charge", "not-in-charge",
"in-charge allocating", "allocating"
"not-in-charge allocating"
}; };
static const char *const dtor_flavors[] = static const char *const dtor_flavors[] =
{ {
@ -1770,7 +1768,7 @@ demangle_ctor_dtor_name (dm)
{ {
/* A constructor name. Consume the C. */ /* A constructor name. Consume the C. */
advance_char (dm); advance_char (dm);
if (peek_char (dm) < '1' || peek_char (dm) > '4') if (peek_char (dm) < '1' || peek_char (dm) > '3')
return "Unrecognized constructor."; return "Unrecognized constructor.";
RETURN_IF_ERROR (result_append_string (dm, dm->last_source_name)); RETURN_IF_ERROR (result_append_string (dm, dm->last_source_name));
/* Print the flavor of the constructor if in verbose mode. */ /* Print the flavor of the constructor if in verbose mode. */
@ -2312,23 +2310,43 @@ demangle_class_enum_type (dm, template_p)
/* Demangles and emits an <array-type>. /* Demangles and emits an <array-type>.
<array-type> ::= A [<dimension number>] _ <element type> */ <array-type> ::= A [<dimension number>] _ <element type>
::= A <dimension expression> _ <element type> */
static status_t static status_t
demangle_array_type (dm) demangle_array_type (dm)
demangling_t dm; demangling_t dm;
{ {
status_t status; status_t status = STATUS_OK;
dyn_string_t array_size = dyn_string_new (10); dyn_string_t array_size = NULL;
char peek;
if (array_size == NULL) RETURN_IF_ERROR (demangle_char (dm, 'A'));
return STATUS_ALLOCATION_FAILED;
status = demangle_char (dm, 'A');
/* Demangle the array size into array_size. */ /* Demangle the array size into array_size. */
if (STATUS_NO_ERROR (status)) peek = peek_char (dm);
if (peek == '_')
/* Array bound is omitted. This is a C99-style VLA. */
;
else if (IS_DIGIT (peek_char (dm)))
{
/* It looks like a constant array bound. */
array_size = dyn_string_new (10);
if (array_size == NULL)
return STATUS_ALLOCATION_FAILED;
status = demangle_number_literally (dm, array_size, 10, 0); status = demangle_number_literally (dm, array_size, 10, 0);
}
else
{
/* Anything is must be an expression for a nont-constant array
bound. This happens if the array type occurs in a template
and the array bound references a template parameter. */
RETURN_IF_ERROR (result_push (dm));
RETURN_IF_ERROR (demangle_expression (dm));
array_size = (dyn_string_t) result_pop (dm);
}
/* array_size may have been allocated by now, so we can't use
RETURN_IF_ERROR until it's been deallocated. */
/* Demangle the base type of the array. */ /* Demangle the base type of the array. */
if (STATUS_NO_ERROR (status)) if (STATUS_NO_ERROR (status))
@ -2339,10 +2357,11 @@ demangle_array_type (dm)
/* Emit the array dimension syntax. */ /* Emit the array dimension syntax. */
if (STATUS_NO_ERROR (status)) if (STATUS_NO_ERROR (status))
status = result_append_char (dm, '['); status = result_append_char (dm, '[');
if (STATUS_NO_ERROR (status)) if (STATUS_NO_ERROR (status) && array_size != NULL)
status = result_append_string (dm, array_size); status = result_append_string (dm, array_size);
if (STATUS_NO_ERROR (status)) if (STATUS_NO_ERROR (status))
status = result_append_char (dm, ']'); status = result_append_char (dm, ']');
if (array_size != NULL)
dyn_string_delete (array_size); dyn_string_delete (array_size);
RETURN_IF_ERROR (status); RETURN_IF_ERROR (status);