FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change storage of demangle_component

Browse source 
This changes demangle_component objects to be stored on the obstack
that is part of demangle_info.  It also arranges for a demangle_info
object to be kept alive by cp_merge_demangle_parse_infos.  This way,
other data on the obstack can be kept while an "outer" demangle_info
needs it.

Acked-By: John Baldwin <jhb@FreeBSD.org>
This commit is contained in:
Tom Tromey 2024-04-11 10:35:09 -06:00
parent ed4eabdf63
commit 6921816e5e
3 changed files with 13 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
gdb/cp-name-parser.y
View file

@ -48,17 +48,6 @@
#define GDB_YY_REMAP_PREFIX cpname
#include "yy-remap.h"
/* The components built by the parser are allocated ahead of time,
and cached in this structure. */
#define ALLOC_CHUNK 100
struct demangle_info {
int used;
struct demangle_info *next;
struct demangle_component comps[ALLOC_CHUNK];
};
%}
%union
@ -92,7 +81,7 @@ struct cpname_state
const char *lexptr, *prev_lexptr, *error_lexptr, *global_errmsg;
struct demangle_info *demangle_info;
demangle_parse_info *demangle_info;
/* The parse tree created by the parser is stored here after a
successful parse. */
@ -136,23 +125,7 @@ struct cpname_state
struct demangle_component *
cpname_state::d_grab ()
{
struct demangle_info *more;
if (demangle_info->used >= ALLOC_CHUNK)
{
if (demangle_info->next == NULL)
{
more = XNEW (struct demangle_info);
more->next = NULL;
demangle_info->next = more;
}
else
more = demangle_info->next;
more->used = 0;
demangle_info = more;
}
return &demangle_info->comps[demangle_info->used++];
return obstack_new<demangle_component> (&demangle_info->obstack);
}
/* Flags passed to d_qualify. */
@ -1929,20 +1902,6 @@ yyerror (cpname_state *state, const char *msg)
state->global_errmsg = msg ? msg : "parse error";
}
/* Allocate a chunk of the components we'll need to build a tree. We
generally allocate too many components, but the extra memory usage
doesn't hurt because the trees are temporary and the storage is
reused. More may be allocated later, by d_grab. */
static struct demangle_info *
allocate_info (void)
{
struct demangle_info *info = XNEW (struct demangle_info);
info->next = NULL;
info->used = 0;
return info;
}
/* See cp-support.h. */
gdb::unique_xmalloc_ptr<char>
@ -1955,20 +1914,6 @@ cp_comp_to_string (struct demangle_component *result, int estimated_len)
return gdb::unique_xmalloc_ptr<char> (res);
}
/* Destructor for demangle_parse_info. */
demangle_parse_info::~demangle_parse_info ()
{
/* Free any allocated chunks of memory for the parse. */
while (info != NULL)
{
struct demangle_info *next = info->next;
free (info);
info = next;
}
}
/* Merge the two parse trees given by DEST and SRC. The parse tree
in SRC is attached to DEST at the node represented by TARGET.
@ -1982,21 +1927,14 @@ demangle_parse_info::~demangle_parse_info ()
void
cp_merge_demangle_parse_infos (struct demangle_parse_info *dest,
struct demangle_component *target,
struct demangle_parse_info *src)
std::unique_ptr<demangle_parse_info> src)
{
struct demangle_info *di;
/* Copy the SRC's parse data into DEST. */
*target = *src->tree;
di = dest->info;
while (di->next != NULL)
di = di->next;
di->next = src->info;
/* Clear the (pointer to) SRC's parse data so that it is not freed when
cp_demangled_parse_info_free is called. */
src->info = NULL;
/* Make sure SRC is owned by DEST. */
dest->infos.push_back (std::move (src));
}
/* Convert a demangled name to a demangle_component tree. On success,
@ -2014,10 +1952,8 @@ cp_demangled_name_to_comp (const char *demangled_name,
state.error_lexptr = NULL;
state.global_errmsg = NULL;
state.demangle_info = allocate_info ();
auto result = std::make_unique<demangle_parse_info> ();
result->info = state.demangle_info;
state.demangle_info = result.get ();
if (yyparse (&state))
{

2
gdb/cp-support.c
View file

@ -258,7 +258,7 @@ inspect_type (struct demangle_parse_info *info,
if (i != NULL)
{
/* Merge the two trees. */
cp_merge_demangle_parse_infos (info, ret_comp, i.get ());
cp_merge_demangle_parse_infos (info, ret_comp, std::move (i));
/* Replace any newly introduced typedefs -- but not
if the type is anonymous (that would lead to infinite

15
gdb/cp-support.h
View file

@ -58,18 +58,15 @@ struct using_direct;
struct demangle_parse_info
{
demangle_parse_info () = default;
~demangle_parse_info ();
/* The memory used during the parse. */
struct demangle_info *info = nullptr;
/* The result of the parse. */
struct demangle_component *tree = nullptr;
/* Any temporary memory used during typedef replacement. */
/* Any memory used during processing. */
auto_obstack obstack;
/* Any other objects referred to by this object, and whose storage
lifetime must be linked. */
std::vector<std::unique_ptr<demangle_parse_info>> infos;
};
@ -182,7 +179,7 @@ extern gdb::unique_xmalloc_ptr<char> cp_comp_to_string
extern void cp_merge_demangle_parse_infos (struct demangle_parse_info *,
struct demangle_component *,
struct demangle_parse_info *);
std::unique_ptr<demangle_parse_info>);
/* The list of "maint cplus" commands. */