From 40f3ce189e3c16398f2e56442e6d8db5573587ee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2020 17:39:52 -0600 Subject: [PATCH] Fix generic_val_print_enum for value-based printing This removes a call to val_print_scalar_formatted from generic_val_print_enum, preferring to do the work in the callers. This lets generic_value_print use the value-based API. gdb/ChangeLog 2020-03-13 Tom Tromey * valprint.c (generic_val_print): Update. (generic_value_print): Update. * valprint.c (generic_val_print_enum): Don't call val_print_scalar_formatted. --- gdb/ChangeLog | 7 +++++++ gdb/valprint.c | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 322d4c7739..f812cd7533 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-03-13 Tom Tromey + + * valprint.c (generic_val_print): Update. + (generic_value_print): Update. + * valprint.c (generic_val_print_enum): Don't call + val_print_scalar_formatted. + 2020-03-13 Tom Tromey * valprint.c (generic_value_print): Call generic_value_print_ptr. diff --git a/gdb/valprint.c b/gdb/valprint.c index 0063bb5e0c..9362bdab2b 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -721,19 +721,13 @@ generic_val_print_enum (struct type *type, struct gdbarch *gdbarch = get_type_arch (type); int unit_size = gdbarch_addressable_memory_unit_size (gdbarch); - if (options->format) - { - val_print_scalar_formatted (type, embedded_offset, - original_value, options, 0, stream); - } - else - { - const gdb_byte *valaddr = value_contents_for_printing (original_value); + gdb_assert (!options->format); - val = unpack_long (type, valaddr + embedded_offset * unit_size); + const gdb_byte *valaddr = value_contents_for_printing (original_value); - generic_val_print_enum_1 (type, val, stream); - } + val = unpack_long (type, valaddr + embedded_offset * unit_size); + + generic_val_print_enum_1 (type, val, stream); } /* generic_val_print helper for TYPE_CODE_FLAGS. */ @@ -977,8 +971,12 @@ generic_val_print (struct type *type, break; case TYPE_CODE_ENUM: - generic_val_print_enum (type, embedded_offset, stream, - original_value, options); + if (options->format) + val_print_scalar_formatted (type, embedded_offset, + original_value, options, 0, stream); + else + generic_val_print_enum (type, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_FLAGS: @@ -1086,8 +1084,10 @@ generic_value_print (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_ENUM: - generic_val_print_enum (type, 0, stream, - val, options); + if (options->format) + value_print_scalar_formatted (val, options, 0, stream); + else + generic_val_print_enum (type, 0, stream, val, options); break; case TYPE_CODE_FLAGS: -- 2.34.1