From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from kwanyin.sergiodj.net (kwanyin.sergiodj.net [158.69.185.54]) by sourceware.org (Postfix) with ESMTPS id E695F385BF81 for ; Fri, 10 Apr 2020 18:16:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E695F385BF81 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [binutils-gdb] Change two more functions to be methods on die_info From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Message-Id: Date: Fri, 10 Apr 2020 14:16:45 -0400 X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-testers@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-testers mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Apr 2020 18:16:48 -0000 *** TEST RESULTS FOR COMMIT a39fdb411d43824b27d886bab42cada62a9fe431 *** commit a39fdb411d43824b27d886bab42cada62a9fe431 Author: Tom Tromey AuthorDate: Thu Mar 26 09:28:08 2020 -0600 Commit: Tom Tromey CommitDate: Thu Mar 26 09:28:25 2020 -0600 Change two more functions to be methods on die_info This changes lookup_addr_base and lookup_ranges_base to be methods on die_info. gdb/ChangeLog 2020-03-26 Tom Tromey * dwarf2/die.h (struct die_info) : New methods. * dwarf2/read.c (lookup_addr_base): Move to die.h. (lookup_ranges_base): Likewise. (read_cutu_die_from_dwo, read_full_die_1): Update. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ee9c24795..b8190a1381 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-03-26 Tom Tromey + + * dwarf2/die.h (struct die_info) : New + methods. + * dwarf2/read.c (lookup_addr_base): Move to die.h. + (lookup_ranges_base): Likewise. + (read_cutu_die_from_dwo, read_full_die_1): Update. + 2020-03-26 Tom Tromey * dwarf2/read.c (read_import_statement, read_file_scope) diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h index 3a265b7df0..c3586645bd 100644 --- a/gdb/dwarf2/die.h +++ b/gdb/dwarf2/die.h @@ -33,6 +33,32 @@ struct die_info return NULL; } + /* Return the address base of the compile unit, which, if exists, is + stored either at the attribute DW_AT_GNU_addr_base, or + DW_AT_addr_base. */ + gdb::optional addr_base () + { + struct attribute *attr = this->attr (DW_AT_addr_base); + if (attr == nullptr) + attr = this->attr (DW_AT_GNU_addr_base); + if (attr == nullptr) + return gdb::optional (); + return DW_UNSND (attr); + } + + /* Return range lists base of the compile unit, which, if exists, is + stored either at the attribute DW_AT_rnglists_base or + DW_AT_GNU_ranges_base. */ + ULONGEST ranges_base () + { + struct attribute *attr = this->attr (DW_AT_rnglists_base); + if (attr == nullptr) + attr = this->attr (DW_AT_GNU_ranges_base); + if (attr == nullptr) + return 0; + return DW_UNSND (attr); + } + /* DWARF-2 tag for this DIE. */ ENUM_BITFIELD(dwarf_tag) tag : 16; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 8c51125efb..64e92ff92f 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6386,34 +6386,6 @@ lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig) } } -/* Return the address base of the compile unit, which, if exists, is stored - either at the attribute DW_AT_GNU_addr_base, or DW_AT_addr_base. */ -static gdb::optional -lookup_addr_base (struct die_info *comp_unit_die) -{ - struct attribute *attr; - attr = comp_unit_die->attr (DW_AT_addr_base); - if (attr == nullptr) - attr = comp_unit_die->attr (DW_AT_GNU_addr_base); - if (attr == nullptr) - return gdb::optional (); - return DW_UNSND (attr); -} - -/* Return range lists base of the compile unit, which, if exists, is stored - either at the attribute DW_AT_rnglists_base or DW_AT_GNU_ranges_base. */ -static ULONGEST -lookup_ranges_base (struct die_info *comp_unit_die) -{ - struct attribute *attr; - attr = comp_unit_die->attr (DW_AT_rnglists_base); - if (attr == nullptr) - attr = comp_unit_die->attr (DW_AT_GNU_ranges_base); - if (attr == nullptr) - return 0; - return DW_UNSND (attr); -} - /* Low level DIE reading support. */ /* Initialize a die_reader_specs struct from a dwarf2_cu struct. */ @@ -6502,12 +6474,12 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu, ranges = dwarf2_attr (stub_comp_unit_die, DW_AT_ranges, cu); comp_dir = dwarf2_attr (stub_comp_unit_die, DW_AT_comp_dir, cu); - cu->addr_base = lookup_addr_base (stub_comp_unit_die); + cu->addr_base = stub_comp_unit_die->addr_base (); /* There should be a DW_AT_rnglists_base (DW_AT_GNU_ranges_base) attribute here (if needed). We need the value before we can process DW_AT_ranges. */ - cu->ranges_base = lookup_ranges_base (stub_comp_unit_die); + cu->ranges_base = stub_comp_unit_die->ranges_base (); } else if (stub_comp_dir != NULL) { @@ -17538,7 +17510,7 @@ read_full_die_1 (const struct die_reader_specs *reader, if (attr != nullptr) cu->str_offsets_base = DW_UNSND (attr); - auto maybe_addr_base = lookup_addr_base(die); + auto maybe_addr_base = die->addr_base (); if (maybe_addr_base.has_value ()) cu->addr_base = *maybe_addr_base; for (int index : indexes_that_need_reprocess)