From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway23.websitewelcome.com (gateway23.websitewelcome.com [192.185.50.129]) by sourceware.org (Postfix) with ESMTPS id 245293945C14 for ; Sat, 3 Oct 2020 19:37:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 245293945C14 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway23.websitewelcome.com (Postfix) with ESMTP id B86F8579F for ; Sat, 3 Oct 2020 14:37:40 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id OnLgkpzG2BD8bOnLgkul2r; Sat, 03 Oct 2020 14:37:40 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=7/cZjhv3mKvt21600IUzTS8WbjelmboGbuo+YdXm9GY=; b=Nn1ZwbZWTO1D6NQPklFJjWB5Vg 511LmuTtuvi5zb6m1VG4rsH9h0bPlMtqVDCidNkCPEdYKu/xgxR/bLek3VjbVkLS0baxDB0O9Vhf7 nkYuBs79BCMn9eV8O7nCdaXbu; Received: from 174-16-122-38.hlrn.qwest.net ([174.16.122.38]:48958 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kOnLg-000LTO-El; Sat, 03 Oct 2020 13:37:40 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/6] Simplify add_target_sections_of_objfile Date: Sat, 3 Oct 2020 13:37:33 -0600 Message-Id: <20201003193735.2532-5-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20201003193735.2532-1-tom@tromey.com> References: <20201003193735.2532-1-tom@tromey.com> 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: 174.16.122.38 X-Source-L: No X-Exim-ID: 1kOnLg-000LTO-El X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-122-38.hlrn.qwest.net (bapiya.Home) [174.16.122.38]:48958 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3035.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, 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-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, 03 Oct 2020 19:37:43 -0000 Now that target_section_table uses std::vector, add_target_sections_of_objfile does not need to loop twice. This patch simplifies this code to have just a single loop. Also, the passed-in objfile can never be NULL, so this changes this function to assert that. 2020-10-03 Tom Tromey * exec.c (add_target_sections_of_objfile): Simplify. --- gdb/ChangeLog | 4 ++++ gdb/exec.c | 14 +------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gdb/exec.c b/gdb/exec.c index d4b9b7bcf65..43385fe978f 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -661,22 +661,10 @@ add_target_sections_of_objfile (struct objfile *objfile) { struct target_section_table *table = current_target_sections; struct obj_section *osect; - unsigned count = 0; - if (objfile == NULL) - return; + gdb_assert (objfile != nullptr); /* Compute the number of sections to add. */ - ALL_OBJFILE_OSECTIONS (objfile, osect) - { - if (bfd_section_size (osect->the_bfd_section) == 0) - continue; - count++; - } - - if (count == 0) - return; - ALL_OBJFILE_OSECTIONS (objfile, osect) { if (bfd_section_size (osect->the_bfd_section) == 0) -- 2.17.2