From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.59]) by sourceware.org (Postfix) with ESMTPS id 2C0A83858407 for ; Sat, 4 Dec 2021 20:38:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2C0A83858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tromey.com Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 6469F72F56 for ; Sat, 4 Dec 2021 14:38:48 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tbo0mv0jT0ESotbo0miKgU; Sat, 04 Dec 2021 14:38:48 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=+HaPDxEDk4YFX8PA/zif7G4X4+PDostyc80qMq5XX6Y=; b=ZKJc2btaJk1eaTrvh1pznwD7la j3DDd2dGLSpPhNNZpPxWjZ4frjxGTvqF6BCkmVHIqVe9x3FHEb2uSfdmGHv7yFMhFQy3obKeXA0Cf vGA9JcnusSj8zbt7sQI7hsSTW; Received: from 97-122-84-67.hlrn.qwest.net ([97.122.84.67]:51986 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mtbo0-000epk-3w; Sat, 04 Dec 2021 13:38:48 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 06/33] Let skip_one_die not skip children Date: Sat, 4 Dec 2021 13:38:17 -0700 Message-Id: <20211204203844.1188999-7-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211204203844.1188999-1-tom@tromey.com> References: <20211204203844.1188999-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.84.67 X-Source-L: No X-Exim-ID: 1mtbo0-000epk-3w X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-84-67.hlrn.qwest.net (localhost.localdomain) [97.122.84.67]:51986 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Dec 2021 20:38:51 -0000 This patch adds an option to skip_one_die that causes it not to skip child DIEs. This is needed in the new scanner. --- gdb/dwarf2/read.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index fcfad3e3361..cc14d510dba 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1442,7 +1442,8 @@ static void dwarf2_symbol_mark_computed (const struct attribute *attr, static const gdb_byte *skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr, - const struct abbrev_info *abbrev); + const struct abbrev_info *abbrev, + bool do_skip_children = true); static hashval_t partial_die_hash (const void *item); @@ -8335,12 +8336,15 @@ skip_children (const struct die_reader_specs *reader, const gdb_byte *info_ptr) /* Scan the debug information for CU starting at INFO_PTR in buffer BUFFER. INFO_PTR should point just after the initial uleb128 of a DIE, and the abbrev corresponding to that skipped uleb128 should be passed in - ABBREV. Returns a pointer to this DIE's sibling, skipping any - children. */ + ABBREV. + + If DO_SKIP_CHILDREN is true, or if the DIE has no children, this + returns a pointer to this DIE's sibling, skipping any children. + Otherwise, returns a pointer to the DIE's first child. */ static const gdb_byte * skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr, - const struct abbrev_info *abbrev) + const struct abbrev_info *abbrev, bool do_skip_children) { unsigned int bytes_read; struct attribute attr; @@ -8353,7 +8357,7 @@ skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr, for (i = 0; i < abbrev->num_attrs; i++) { /* The only abbrev we care about is DW_AT_sibling. */ - if (abbrev->attrs[i].name == DW_AT_sibling) + if (do_skip_children && abbrev->attrs[i].name == DW_AT_sibling) { read_attribute (reader, &attr, &abbrev->attrs[i], info_ptr); if (attr.form == DW_FORM_ref_addr) @@ -8470,7 +8474,7 @@ skip_one_die (const struct die_reader_specs *reader, const gdb_byte *info_ptr, } } - if (abbrev->has_children) + if (do_skip_children && abbrev->has_children) return skip_children (reader, info_ptr); else return info_ptr; -- 2.31.1