From c51f6a54c28aaf2039f95553ff897338475fe8bf Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Jul 2018 12:17:36 -0600 Subject: [PATCH] Call value_fetch_lazy when needed in pretty-printers This removes some unused variables, and replaces the calls to value_contents_for_printing with a call to value_fetch_lazy, when needed. gdb/ChangeLog 2018-07-22 Tom Tromey * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Remove unused variable. Call value_fetch_lazy when needed. * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): Remove unused variable. Call value_fetch_lazy when needed. --- gdb/ChangeLog | 7 +++++++ gdb/guile/scm-pretty-print.c | 4 +++- gdb/python/py-prettyprint.c | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a05f459151d..591cb935aa2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-07-22 Tom Tromey + + * python/py-prettyprint.c (gdbpy_apply_val_pretty_printer): Remove + unused variable. Call value_fetch_lazy when needed. + * guile/scm-pretty-print.c (gdbscm_apply_val_pretty_printer): + Remove unused variable. Call value_fetch_lazy when needed. + 2018-07-22 Tom Tromey * m32c-tdep.c (mark_dma): Return void. diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c index 3fe36820a6a..f292960dbbd 100644 --- a/gdb/guile/scm-pretty-print.c +++ b/gdb/guile/scm-pretty-print.c @@ -949,7 +949,9 @@ gdbscm_apply_val_pretty_printer (const struct extension_language_defn *extlang, enum display_hint hint; enum ext_lang_rc result = EXT_LANG_RC_NOP; enum string_repr_result print_result; - const gdb_byte *valaddr = value_contents_for_printing (val); + + if (value_lazy (val)) + value_fetch_lazy (val); /* No pretty-printer support for unavailable values. */ if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type))) diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 21b1ce94879..a8a84899309 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -662,7 +662,9 @@ gdbpy_apply_val_pretty_printer (const struct extension_language_defn *extlang, struct gdbarch *gdbarch = get_type_arch (type); struct value *value; enum string_repr_result print_result; - const gdb_byte *valaddr = value_contents_for_printing (val); + + if (value_lazy (val)) + value_fetch_lazy (val); /* No pretty-printer support for unavailable values. */ if (!value_bytes_available (val, embedded_offset, TYPE_LENGTH (type))) -- 2.30.2