Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Allow pretty-print of static members

Browse Source 
Python pretty-printers haven't applied to static members for quite
some time.  I tracked this down to the call to cp_print_value_fields
in cp_print_static_field -- it doesn't let pretty-printers have a
chance to print the value.  This patch fixes the problem.

The way that static members are handled is very weird to me.  I tend
to think this should be done more globally, like in value_print.
However, I haven't made any big change.

Reviewed-by:  Keith Seitz <keiths@redhat.com>
Tested-by:  Keith Seitz <keiths@redhat.com>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30057
This commit is contained in:
Tom Tromey
2023-04-21 18:53:48 -06:00
parent 973f18b57c
commit 3c0e312054
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gdb/cp-valprint.c
View File

@@ -381,6 +381,32 @@ cp_print_value_fields (struct value *val, struct ui_file *stream,
gdb_printf (stream, "}");
}
/* A wrapper for cp_print_value_fields that tries to apply a
pretty-printer first. */
static void
cp_print_value_fields_pp (struct value *val,
struct ui_file *stream,
int recurse,
const struct value_print_options *options,
struct type **dont_print_vb,
int dont_print_statmem)
{
int result = 0;
/* Attempt to run an extension language pretty-printer if
possible. */
if (!options->raw)
result
= apply_ext_lang_val_pretty_printer (val, stream,
recurse, options,
current_language);
if (!result)
cp_print_value_fields (val, stream, recurse, options, dont_print_vb,
dont_print_statmem);
}
/* Special val_print routine to avoid printing multiple copies of
virtual baseclasses. */
@@ -493,27 +519,16 @@ cp_print_value (struct value *val, struct ui_file *stream,
val_print_invalid_address (stream);
else
{
int result = 0;
if (!val_print_check_max_depth (stream, recurse, options,
current_language))
{
struct value *baseclass_val = val->primitive_field (0,
i, type);
/* Attempt to run an extension language pretty-printer on the
baseclass if possible. */
if (!options->raw)
result
= apply_ext_lang_val_pretty_printer (baseclass_val, stream,
recurse, options,
current_language);
if (!result)
cp_print_value_fields (baseclass_val, stream, recurse, options,
((struct type **)
obstack_base (&dont_print_vb_obstack)),
0);
cp_print_value_fields_pp
(baseclass_val, stream, recurse, options,
(struct type **) obstack_base (&dont_print_vb_obstack),
0);
}
}
gdb_puts (", ", stream);
@@ -581,7 +596,7 @@ cp_print_static_field (struct type *type,
obstack_grow (&dont_print_statmem_obstack, (char *) &addr,
sizeof (CORE_ADDR));
cp_print_value_fields (val, stream, recurse, options, NULL, 1);
cp_print_value_fields_pp (val, stream, recurse, options, nullptr, 1);
return;
}