From e74b39ded0a18ee3aa1e84580f6856ec40568a07 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 14 Aug 2020 15:06:08 +0100 Subject: [PATCH] gdb: remove LA_PRINT_ARRAY_INDEX macro Replace the single use of the LA_PRINT_ARRAY_INDEX macro with the macro's definition, and delete the macro. There should be no user visible changes after this commit. gdb/ChangeLog: * language.h (LA_PRINT_ARRAY_INDEX): Delete. * valprint.c (maybe_print_array_index): Replace use of macro with the macros definition. --- gdb/ChangeLog | 6 ++++++ gdb/language.h | 4 ---- gdb/valprint.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec1bdca6ea7..db2d3f172ec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-23 Andrew Burgess + + * language.h (LA_PRINT_ARRAY_INDEX): Delete. + * valprint.c (maybe_print_array_index): Replace use of macro with + the macros definition. + 2020-10-23 Andrew Burgess * ada-lang.c (ada_language::print_array_index): Call value_print diff --git a/gdb/language.h b/gdb/language.h index c85f90f8b4b..bffa9fddfee 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -652,10 +652,6 @@ extern enum language set_language (enum language); #define LA_EMIT_CHAR(ch, type, stream, quoter) \ (current_language->emitchar (ch, type, stream, quoter)) -#define LA_PRINT_ARRAY_INDEX(index_type, index_value, stream, options) \ - (current_language->print_array_index(index_type, index_value, stream, \ - options)) - #define LA_ITERATE_OVER_SYMBOLS(BLOCK, NAME, DOMAIN, CALLBACK) \ (current_language->iterate_over_symbols (BLOCK, NAME, DOMAIN, CALLBACK)) diff --git a/gdb/valprint.c b/gdb/valprint.c index 880d04f8c1d..4fdb9eaca3a 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -1866,8 +1866,8 @@ maybe_print_array_index (struct type *index_type, LONGEST index, { if (!options->print_array_indexes) return; - - LA_PRINT_ARRAY_INDEX (index_type, index, stream, options); + + current_language->print_array_index (index_type, index, stream, options); } /* See valprint.h. */ -- 2.30.2