From 2ef46c2fbbd18c3f411ef294c2c6694a1308a5a5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 26 Mar 2020 09:28:08 -0600 Subject: [PATCH] Trivial fix in dwarf_decode_macro_bytes One spot in dwarf_decode_macro_bytes could use the existing "objfile" local variable. gdb/ChangeLog 2020-03-26 Tom Tromey * dwarf2/macro.c (dwarf_decode_macro_bytes): Use objfile local variable. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2/macro.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c9459365173..1472f6679c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-03-26 Tom Tromey + + * dwarf2/macro.c (dwarf_decode_macro_bytes): Use objfile local + variable. + 2020-03-26 Tom Tromey * dwarf2/macro.h (dwarf_decode_macros): Make section parameter diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c index 49586399673..6c2d2514652 100644 --- a/gdb/dwarf2/macro.c +++ b/gdb/dwarf2/macro.c @@ -512,9 +512,9 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile, body = dwz->read_string (objfile, str_offset); } else - body = (dwarf2_per_objfile->str.read_string - (dwarf2_per_objfile->objfile, - str_offset, "DW_FORM_strp")); + body = dwarf2_per_objfile->str.read_string (objfile, + str_offset, + "DW_FORM_strp"); } is_define = (macinfo_type == DW_MACRO_define -- 2.30.2